resolved: Do not add .busname dependencies, when compiling without kdbus.
This commit is contained in:
parent
33c2ce7b20
commit
defa8e675b
|
@ -5611,7 +5611,7 @@ dist_dbussystemservice_DATA += \
|
||||||
src/resolve/org.freedesktop.resolve1.service
|
src/resolve/org.freedesktop.resolve1.service
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
units/systemd-resolved.service.in
|
units/systemd-resolved.service.m4.in
|
||||||
|
|
||||||
SYSTEM_UNIT_ALIASES += \
|
SYSTEM_UNIT_ALIASES += \
|
||||||
systemd-resolved.service dbus-org.freedesktop.resolve1.service
|
systemd-resolved.service dbus-org.freedesktop.resolve1.service
|
||||||
|
|
1
units/.gitignore
vendored
1
units/.gitignore
vendored
|
@ -56,6 +56,7 @@
|
||||||
/systemd-reboot.service
|
/systemd-reboot.service
|
||||||
/systemd-remount-fs.service
|
/systemd-remount-fs.service
|
||||||
/systemd-resolved.service
|
/systemd-resolved.service
|
||||||
|
/systemd-resolved.service.m4
|
||||||
/systemd-hibernate-resume@.service
|
/systemd-hibernate-resume@.service
|
||||||
/systemd-rfkill@.service
|
/systemd-rfkill@.service
|
||||||
/systemd-shutdownd.service
|
/systemd-shutdownd.service
|
||||||
|
|
|
@ -10,11 +10,13 @@ Description=Network Name Resolution
|
||||||
Documentation=man:systemd-resolved.service(8)
|
Documentation=man:systemd-resolved.service(8)
|
||||||
After=systemd-networkd.service network.service
|
After=systemd-networkd.service network.service
|
||||||
|
|
||||||
|
m4_ifdef(`ENABLE_KDBUS',
|
||||||
# On kdbus systems we pull in the busname explicitly, because it
|
# On kdbus systems we pull in the busname explicitly, because it
|
||||||
# carries policy that allows the daemon to acquire its name.
|
# carries policy that allows the daemon to acquire its name.
|
||||||
Wants=org.freedesktop.resolve1.busname
|
Wants=org.freedesktop.resolve1.busname
|
||||||
After=org.freedesktop.resolve1.busname
|
After=org.freedesktop.resolve1.busname
|
||||||
|
|
||||||
|
)m4_dnl
|
||||||
[Service]
|
[Service]
|
||||||
Type=notify
|
Type=notify
|
||||||
Restart=always
|
Restart=always
|
Loading…
Reference in a new issue