clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 21:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: set env var container=systemd-nspawn, following the scheme lxc introduced

Browse Source
This commit is contained in:
Lennart Poettering
2011-09-23 16:28:27 +02:00
parent d77c31f8f3
commit 3bb1c6b04f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn.c
+5 -4
View File
@@ -727,6 +727,7 @@ int main(int argc, char *argv[]) {
gid_t gid = (gid_t) -1;
const char *envp[] = {
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"container=systemd-nspawn", /* LXC sets container=lxc, so follow the scheme here */
NULL, /* TERM */
NULL, /* HOME */
NULL, /* USER */
@@ -734,7 +735,7 @@ int main(int argc, char *argv[]) {
NULL
};
envp[1] = strv_find_prefix(environ, "TERM=");
envp[2] = strv_find_prefix(environ, "TERM=");
close_nointr_nofail(master);
@@ -830,9 +831,9 @@ int main(int argc, char *argv[]) {
}
}
if ((asprintf((char**)(envp + 2), "HOME=%s", home? home: "/root") < 0) ||
(asprintf((char**)(envp + 3), "USER=%s", arg_user? arg_user : "root") < 0) ||
(asprintf((char**)(envp + 4), "LOGNAME=%s", arg_user? arg_user : "root") < 0)) {
if ((asprintf((char**)(envp + 3), "HOME=%s", home? home: "/root") < 0) ||
(asprintf((char**)(envp + 4), "USER=%s", arg_user? arg_user : "root") < 0) ||
(asprintf((char**)(envp + 5), "LOGNAME=%s", arg_user? arg_user : "root") < 0)) {
log_error("Out of memory");
goto child_fail;
}