clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-08-26 18:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102 from laijs/HOME-env

Browse Source 
set the HOME env correctly when it is not configured
This commit is contained in:
Lai Jiangshan
2016-05-20 07:57:27 +08:00
parent 185cfb9fe4 ece6aa1a79
commit 5b7069c8b4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+7 -6
View File
@@ -488,7 +488,7 @@ static int hyper_container_init(void *data)
goto fail;
}
// set additinal env before config so that the config can overwrite it
// set early env. the container env config can overwrite it
setenv("HOME", "/root", 1);
setenv("HOSTNAME", arg->pod->hostname, 1);
if (container->exec.tty)
@@ -496,11 +496,6 @@ static int hyper_container_init(void *data)
else
unsetenv("TERM");
if (hyper_setup_env(container->exec.envs, container->exec.envs_num) < 0) {
fprintf(stdout, "setup env failed\n");
goto fail;
}
if (mount("", "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) {
perror("mount SLAVE failed");
goto fail;
@@ -615,6 +610,12 @@ static int hyper_container_init(void *data)
goto fail;
}
// set the container env
if (hyper_setup_env(container->exec.envs, container->exec.envs_num) < 0) {
fprintf(stdout, "setup env failed\n");
goto fail;
}
hyper_send_type(arg->pipe[1], READY);
fflush(stdout);
src/exec.c
+6
View File
@@ -271,6 +271,12 @@ int hyper_setup_exec_user(struct hyper_exec *exec)
perror("setuid() fails");
goto fail;
}
free(groups);
// set user related envs. the container env config can overwrite it
setenv("USER", pwd->pw_name, 1);
setenv("HOME", pwd->pw_dir, 1);
return 0;
fail: