summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-03-14 16:48:54 +0100
committerMichael Biebl <biebl@debian.org>2015-03-14 16:50:47 +0100
commit6962fd3bd28cb5d3aaff69c1e3b6cc006e7c8426 (patch)
tree39f695d9a0a4e45c50d7e1a84bf9f1ffbaa26f41
parent6421348d5263ee1a36037c3e119a01351f0f83e9 (diff)
service: don't add After= dependencies on .busname units if kdbus support is disabled
-rw-r--r--src/core/service.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/service.c b/src/core/service.c
index db1f1e78ef..d9385504e8 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;
}