diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-19 12:23:13 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-19 13:01:19 +0100 |
| commit | 79a224c46012f2817e3fa431ff30d10f4d3b6626 (patch) | |
| tree | 27e257f5b581059570de956c70be39e1737159c5 /src/core/manager.h | |
| parent | manager: log on two OOM occasions (diff) | |
| download | systemd-79a224c46012f2817e3fa431ff30d10f4d3b6626.tar.xz systemd-79a224c46012f2817e3fa431ff30d10f4d3b6626.zip | |
main: when reloading PID 1 let's reset the default environment
Otherwise we keep collecting stuff from env generators, and we really
shouldn't.
This was working properly on reexec but not on reload, as for reexec we
would always start fresh, but for reload would reuse the Manager object
and hence its default environment set.
Fixes: #10671
Diffstat (limited to 'src/core/manager.h')
| -rw-r--r-- | src/core/manager.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/manager.h b/src/core/manager.h index b65c4c8451..f3ad44d26e 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -442,6 +442,7 @@ void manager_clear_jobs(Manager *m); unsigned manager_dispatch_load_queue(Manager *m); +int manager_default_environment(Manager *m); int manager_transient_environment_add(Manager *m, char **plus); int manager_client_environment_modify(Manager *m, char **minus, char **plus); int manager_get_effective_environment(Manager *m, char ***ret); |