From: Franck Bui <fbui@suse.com>
Date: Mon, 20 Jun 2016 16:54:21 +0000 (+0200)
Subject: Revert "do not pass-along the environment from the kernel or initrd"
X-Git-Tag: v231~136^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ce0611e42c2b0d11007e2172edaa86ce4e4125d;p=thirdparty%2Fsystemd.git

Revert "do not pass-along the environment from the kernel or initrd"

This reverts commit ce8aba568156f2b9d0d3b023e960cda3d9d7db81.

We should pass an environment as close as possible to what we originally
got.
---

diff --git a/src/core/main.c b/src/core/main.c
index cef75759374..40d7ff9be51 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1995,10 +1995,6 @@ finish:
                         args[i++] = sfd;
                         args[i++] = NULL;
 
-                        /* do not pass along the environment we inherit from the kernel or initrd */
-                        if (switch_root_dir)
-                                (void) clearenv();
-
                         assert(i <= args_size);
 
                         /*