summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.j.ledkov@intel.com>2015-03-17 16:37:07 +0100
committerMichael Biebl <biebl@debian.org>2015-03-19 17:27:39 +0100
commitdefa8e675b2903ad53e093bb2847c7256f0779a5 (patch)
tree0e0070a126e930695254c1970605afff33ed87b3
parent33c2ce7b200747c172d4899c717a8e9097d84659 (diff)
resolved: Do not add .busname dependencies, when compiling without kdbus.
-rw-r--r--Makefile.am2
-rw-r--r--units/.gitignore1
-rw-r--r--units/systemd-resolved.service.m4.in (renamed from units/systemd-resolved.service.in)2
3 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 856accb0d6..dd8b825004 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5611,7 +5611,7 @@ dist_dbussystemservice_DATA += \
src/resolve/org.freedesktop.resolve1.service
EXTRA_DIST += \
- units/systemd-resolved.service.in
+ units/systemd-resolved.service.m4.in
SYSTEM_UNIT_ALIASES += \
systemd-resolved.service dbus-org.freedesktop.resolve1.service
diff --git a/units/.gitignore b/units/.gitignore
index 26ae965853..ad469c1041 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -56,6 +56,7 @@
/systemd-reboot.service
/systemd-remount-fs.service
/systemd-resolved.service
+/systemd-resolved.service.m4
/systemd-hibernate-resume@.service
/systemd-rfkill@.service
/systemd-shutdownd.service
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.m4.in
index b643da9a73..d133847d5e 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.m4.in
@@ -10,11 +10,13 @@ Description=Network Name Resolution
Documentation=man:systemd-resolved.service(8)
After=systemd-networkd.service network.service
+m4_ifdef(`ENABLE_KDBUS',
# On kdbus systems we pull in the busname explicitly, because it
# carries policy that allows the daemon to acquire its name.
Wants=org.freedesktop.resolve1.busname
After=org.freedesktop.resolve1.busname
+)m4_dnl
[Service]
Type=notify
Restart=always