From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Mar 2010 14:27:19 +0000 (+0200)
Subject: execute: when running in session mode, still enforce proper ordering of logger socket
X-Git-Tag: v1~678
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c9dae904f3a07ae563bd58fb2b39529c1f108915;hp=ebfaa1586ec50e802cc8d650c453f9a0ece80aeb

execute: when running in session mode, still enforce proper ordering of logger socket
---

diff --git a/load-fragment.c b/load-fragment.c
index 1e98004c3..0b43c8119 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;
                 }
         }