diff options
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 73ac7499bd..eb9c4e65c6 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -531,9 +531,9 @@ static int manager_default_environment(Manager *m) { if (MANAGER_IS_SYSTEM(m)) { /* The system manager always starts with a clean * environment for its children. It does not import - * the kernel or the parents exported variables. + * the kernel's or the parents' exported variables. * - * The initial passed environ is untouched to keep + * The initial passed environment is untouched to keep * /proc/self/environ valid; it is used for tagging * the init process inside containers. */ m->environment = strv_new("PATH=" DEFAULT_PATH, @@ -541,11 +541,10 @@ static int manager_default_environment(Manager *m) { /* Import locale variables LC_*= from configuration */ locale_setup(&m->environment); - } else { + } else /* The user manager passes its own environment * along to its children. */ m->environment = strv_copy(environ); - } if (!m->environment) return -ENOMEM; |