]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "do not pass-along the environment from the kernel or initrd"
authorFranck Bui <fbui@suse.com>
Mon, 20 Jun 2016 16:54:21 +0000 (18:54 +0200)
committerFranck Bui <fbui@suse.com>
Mon, 20 Jun 2016 16:55:09 +0000 (18:55 +0200)
This reverts commit ce8aba568156f2b9d0d3b023e960cda3d9d7db81.

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

src/core/main.c

index cef757593749a94d9fdd52290e02f1e44b8b82cf..40d7ff9be51209eb7c5b261802b4bbfe0e130423 100644 (file)
@@ -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);
 
                         /*