clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-03 20:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

recreate /etc/resolv.conf iif specified in pod spec

Browse Source 
hyperd would inject a default DNS server if user did not specify
it in pod spec. If we recreate resolv.conf here, the injected file
will be lost.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao
2016-04-17 17:37:52 +08:00
parent 9590958aae
commit a0bc0851d6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+10 -3
View File
@@ -238,14 +238,15 @@ static int container_recreate_symlink(char *oldpath, char *newpath)
* which we have over ridden in container_setup_mount, so no need to create
* them here.
*/
static int container_setup_init_layer(struct hyper_container *container)
static int container_setup_init_layer(struct hyper_container *container,
int setup_dns)
{
if (!container->initialize)
return 0;
hyper_mkdir("./etc/");
if (container_recreate_file("./etc/resolv.conf") < 0)
if (setup_dns && container_recreate_file("./etc/resolv.conf") < 0)
return -1;
if (container_recreate_file("./etc/hosts") < 0)
@@ -410,6 +411,7 @@ static int hyper_container_init(void *data)
struct hyper_container_arg *arg = data;
struct hyper_container *container = arg->c;
char root[512], rootfs[512];
int setup_dns;
fprintf(stdout, "%s in\n", __func__);
if (container->exec.argv == NULL) {
@@ -498,7 +500,12 @@ static int hyper_container_init(void *data)
}
chdir(rootfs);
if (container_setup_init_layer(container) < 0) {
/*
* Recreate dns resolver iif configured by pod spec. Other cases
* are handled by hyperd instead.
*/
setup_dns = arg->pod->dns != NULL && arg->pod->d_num > 0;
if (container_setup_init_layer(container, setup_dns) < 0) {
fprintf(stderr, "container sets up init layer failed\n");
goto fail;
}