systemd/0114-resolved-Do-not-add-.busname-dependencies-when-compi.patch
2015-04-29 10:05:09 -04:00

61 lines
2.2 KiB
Diff

From 412dc90d0b48e3253786309eb563a8c1e79db22a Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Date: Tue, 17 Mar 2015 16:37:07 +0100
Subject: [PATCH] resolved: Do not add .busname dependencies, when compiling
without kdbus.
(cherry picked from commit defa8e675b2903ad53e093bb2847c7256f0779a5)
---
Makefile.am | 2 +-
units/.gitignore | 1 +
units/{systemd-resolved.service.in => systemd-resolved.service.m4.in} | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
rename units/{systemd-resolved.service.in => systemd-resolved.service.m4.in} (96%)
diff --git a/Makefile.am b/Makefile.am
index aadaad2b8d..78f77d7090 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5459,7 +5459,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 6fdb629c3d..c59676c95b 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -55,6 +55,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
similarity index 96%
rename from units/systemd-resolved.service.in
rename to 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