chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6421348
)
service: don't add After= dependencies on .busname units if kdbus support is disabled
author
Michael Biebl
<biebl@debian.org>
Sat, 14 Mar 2015 15:48:54 +0000
(16:48 +0100)
committer
Michael Biebl
<biebl@debian.org>
Sat, 14 Mar 2015 15:50:47 +0000
(16:50 +0100)
src/core/service.c
patch
|
blob
|
history
diff --git
a/src/core/service.c
b/src/core/service.c
index db1f1e78efcfd8b74cec30dcb12f43dc6ed48b86..d9385504e8af7e65106e7192317f1f83cfa5ef77 100644
(file)
--- 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) {
s->notify_access = NOTIFY_MAIN;
if (s->bus_name) {
+#ifdef ENABLE_KDBUS
const char *n;
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;
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;
}
if (r < 0)
return r;
}