diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-03-17 16:37:07 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-04-28 23:44:55 -0400 |
| commit | 412dc90d0b48e3253786309eb563a8c1e79db22a (patch) | |
| tree | 4c6f582c6af91166ba8c6e5e0135bde590b5c7a8 | |
| parent | 78bce4363bb349a64ed98ac307421698c8f8e06e (diff) | |
resolved: Do not add .busname dependencies, when compiling without kdbus.
(cherry picked from commit defa8e675b2903ad53e093bb2847c7256f0779a5)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -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 aadaad2b8..78f77d709 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 6fdb629c3..c59676c95 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 index b643da9a7..d133847d5 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 |