chiark / gitweb /
unit: pull in logger unit only when running in system mode
authorLennart Poettering <lennart@poettering.net>
Thu, 7 Apr 2011 16:47:11 +0000 (18:47 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 7 Apr 2011 16:47:11 +0000 (18:47 +0200)
src/unit.c

index 90773e8..e5a9623 100644 (file)
@@ -567,11 +567,8 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
         /* If syslog or kernel logging is requested, make sure our own
          * logging daemon is run first. */
 
-        if ((r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0)
-                return r;
-
         if (u->meta.manager->running_as == MANAGER_SYSTEM)
-                if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0)
+                if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0)
                         return r;
 
         return 0;