[systemd-commits] src/core

[Michael Biebl]

 src/core/service.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 6962fd3bd28cb5d3aaff69c1e3b6cc006e7c8426
Author: Michael Biebl <biebl at debian.org>
Date:   Sat Mar 14 16:48:54 2015 +0100

    service: don't add After= dependencies on .busname units if kdbus support is disabled

diff --git a/src/core/service.c b/src/core/service.c
index db1f1e7..d938550 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -555,14 +555,16 @@ static int service_add_extras(Service *s) {
                 s->notify_access = NOTIFY_MAIN;
 
         if (s->bus_name) {
+#ifdef ENABLE_KDBUS
                 const char *n;
 
-                r = unit_watch_bus_name(UNIT(s), s->bus_name);
+                n = strjoina(s->bus_name, ".busname");
+                r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, n, NULL, true);
                 if (r < 0)
                         return r;
+#endif
 
-                n = strjoina(s->bus_name, ".busname");
-                r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, n, NULL, true);
+                r = unit_watch_bus_name(UNIT(s), s->bus_name);
                 if (r < 0)
                         return r;
         }