dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

let mount and swap units log to the configured defaults

Browse Source 
Related-to: https://bugzilla.redhat.com/show_bug.cgi?id=750032
This commit is contained in:
Michal Schmidt
2011-11-19 02:47:09 +01:00
parent 1a4459d633
commit f6cebb3bd5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mount.c
View File

@@ -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

5
src/swap.c
View File

@@ -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;