diff options
| author | Oleksii Shevchuk <alxchk@gmail.com> | 2013-02-12 01:14:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-02-13 00:17:17 +0100 |
| commit | 4a9fd066f0804a41f3d34676101fb8fdc141ef13 (patch) | |
| tree | 36f8d86757bdfaa305eb97f57ef9cf2abe6de952 /src/core | |
| parent | d01a73b6396f57792113c1b5df6e8492fc703e5e (diff) | |
manager: pass environment over daemon-reexec
Fixes this bug:
alxchk > systemctl --user set-environment A=B
alxchk > systemctl --user show-environment | grep ^A=
A=B
alxchk > systemctl --user daemon-reexec
alxchk > systemctl --user show-environment | grep ^A=
alxchk >
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/manager.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 4bebb2996f..bd49892cd4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1856,6 +1856,7 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool serialize_jobs) { Iterator i; Unit *u; const char *t; + char **e; int r; assert(m); @@ -1879,6 +1880,14 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool serialize_jobs) { dual_timestamp_serialize(f, "finish-timestamp", &m->finish_timestamp); } + STRV_FOREACH(e, m->environment) { + _cleanup_free_ char *ce; + + ce = cescape(*e); + if (ce) + fprintf(f, "env=%s\n", *e); + } + fputc('\n', f); HASHMAP_FOREACH_KEY(u, t, m->units, i) { @@ -1979,7 +1988,25 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { dual_timestamp_deserialize(l+20, &m->userspace_timestamp); else if (startswith(l, "finish-timestamp=")) dual_timestamp_deserialize(l+17, &m->finish_timestamp); - else + else if (startswith(l, "env=")) { + _cleanup_free_ char *uce = NULL; + char **e; + + uce = cunescape(l+4); + if (!uce) { + r = -ENOMEM; + goto finish; + } + + e = strv_env_set(m->environment, uce); + if (!e) { + r = -ENOMEM; + goto finish; + } + + strv_free(m->environment); + m->environment = e; + } else log_debug("Unknown serialization item '%s'", l); } |