diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-11-19 02:47:09 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2011-11-19 03:16:55 +0100 |
| commit | f6cebb3bd5a00d79c8131637c0f6796a75e6af99 (patch) | |
| tree | 562f7e536ab96598a77e4d16061f04ffe50c8ace | |
| parent | pam-module: treat "cron" in PAM_TTY as empty tty (diff) | |
| download | systemd-f6cebb3bd5a00d79c8131637c0f6796a75e6af99.tar.xz systemd-f6cebb3bd5a00d79c8131637c0f6796a75e6af99.zip | |
let mount and swap units log to the configured defaults
Related-to: https://bugzilla.redhat.com/show_bug.cgi?id=750032
| -rw-r--r-- | src/mount.c | 6 | ||||
| -rw-r--r-- | src/swap.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mount.c b/src/mount.c index f9cfe910a0..47422ccf8b 100644 --- a/src/mount.c +++ b/src/mount.c @@ -68,8 +68,10 @@ static void mount_init(Unit *u) { /* The stdio/kmsg bridge socket is on /, in order to avoid a * dep loop, don't use kmsg logging for -.mount */ - if (!unit_has_name(u, "-.mount")) - m->exec_context.std_output = EXEC_OUTPUT_KMSG; + if (!unit_has_name(u, "-.mount")) { + m->exec_context.std_output = u->meta.manager->default_std_output; + m->exec_context.std_error = u->meta.manager->default_std_error; + } /* We need to make sure that /bin/mount is always called in * the same process group as us, so that the autofs kernel diff --git a/src/swap.c b/src/swap.c index 54a8640aa4..4fa30a3e32 100644 --- a/src/swap.c +++ b/src/swap.c @@ -74,7 +74,7 @@ static void swap_unset_proc_swaps(Swap *s) { s->parameters_proc_swaps.what = NULL; } - static void swap_init(Unit *u) { +static void swap_init(Unit *u) { Swap *s = SWAP(u); assert(s); @@ -83,7 +83,8 @@ static void swap_unset_proc_swaps(Swap *s) { s->timeout_usec = DEFAULT_TIMEOUT_USEC; exec_context_init(&s->exec_context); - s->exec_context.std_output = EXEC_OUTPUT_KMSG; + s->exec_context.std_output = u->meta.manager->default_std_output; + s->exec_context.std_error = u->meta.manager->default_std_error; s->parameters_etc_fstab.priority = s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1; |