shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

resolved: Do not add .busname dependencies, when compiling without kdbus.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2015-03-17 16:37:07 +01:00 committed by Michael Biebl
parent 33c2ce7b20
commit defa8e675b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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

1
units/.gitignore vendored
View File

@ -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

2
units/systemd-resolved.service.in → units/systemd-resolved.service.m4.in
View File

@ -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