diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-11 12:56:51 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-11 13:20:34 +0200 |
| commit | 71ecc858fa91a686a050bee51804d43865ce1acc (patch) | |
| tree | 2bb4c6e504a1d3f652e00ce84bd9e1a3c21fd588 /src/main.c | |
| parent | 6996295f85a0402b8a72d76c1eab02fb8152f81d (diff) | |
main: drop container/initrd env vars from inherited set
Leave the env vars used in the container/initrd logic set for PID1, but
don't inherit them to any children.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 589d9f042..a0bcbdf06 100644 --- a/src/main.c +++ b/src/main.c @@ -1333,9 +1333,10 @@ int main(int argc, char *argv[]) { arg_running_as == MANAGER_SYSTEM); if (arg_running_as == MANAGER_SYSTEM) { - /* Parse the data passed to us by the initrd and unset it */ + /* Parse the data passed to us. We leave this + * variables set, but the manager later on will not + * pass them on to our children. */ parse_initrd_timestamp(&initrd_timestamp); - filter_environ("RD_"); /* Unset some environment variables passed in from the * kernel that don't really make sense for us. */ |