diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-08 14:05:24 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-08 14:45:19 +0200 |
| commit | b3680f49e20c51e31c8dea84a11207df7b8f0100 (patch) | |
| tree | 400fa9847c6fe350078c08c01ab14737fd4112de /src/core/manager.h | |
| parent | 9735bd12ab7668cc1b7b518299797b101f16bd58 (diff) | |
Do not serialize environment, when switching root
When switching root, i.e. LANG can be set to the locale of the initramfs
or "C", if it was unset. When systemd deserializes LANG in the real root
this would overwrite the setting previously gathered by locale_set().
To reproduce, boot with an initramfs without locale.conf or change
/etc/locale.conf to a different language than the initramfs and check a
daemon started by systemd:
$ tr "$\000" '\n' </proc/$(pidof sshd)/environ | grep LANG
LANG=C
To prevent that, serialization of environment variables is skipped, when
serializing for switching root.
https://bugzilla.redhat.com/show_bug.cgi?id=949525
Diffstat (limited to 'src/core/manager.h')
| -rw-r--r-- | src/core/manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/manager.h b/src/core/manager.h index 9d8d9439d2..649a8aac51 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -278,7 +278,7 @@ void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid int manager_open_serialization(Manager *m, FILE **_f); -int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool serialize_jobs); +int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root); int manager_deserialize(Manager *m, FILE *f, FDSet *fds); int manager_distribute_fds(Manager *m, FDSet *fds); |