diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-03-31 16:27:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-03-31 16:27:19 +0200 |
| commit | c9dae904f3a07ae563bd58fb2b39529c1f108915 (patch) | |
| tree | 6c8a0d27c06e14d50b92dc16bd1db2d2511a122f | |
| parent | ebfaa1586ec50e802cc8d650c453f9a0ece80aeb (diff) | |
execute: when running in session mode, still enforce proper ordering of logger socket
| -rw-r--r-- | load-fragment.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/load-fragment.c b/load-fragment.c index 1e98004c39..0b43c81194 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -1253,8 +1253,7 @@ int unit_load_fragment(Unit *u) { c = NULL; if (c && - (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG) && - u->meta.manager->running_as != MANAGER_SESSION) { + (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG)) { int k; /* If syslog or kernel logging is requested, make sure @@ -1263,8 +1262,9 @@ int unit_load_fragment(Unit *u) { if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0) return k; - if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0) - return k; + if (u->meta.manager->running_as != MANAGER_SESSION) + if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0) + return k; } } |