picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

units: make resolved pull in its own .busname unit, but only on kdbus systems 

The daemon requires the busname unit to operate, since it contains the
policy that allows it to acquire its service name.
This commit is contained in:
Lennart Poettering 2015-01-07 22:19:02 +01:00
parent 8545f7ceaa
commit 78ad7cf1b9
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
units/org.freedesktop.resolve1.busname
View File

@ -10,6 +10,11 @@ Description=Network Name Resolution Service Bus Name
Documentation=man:systemd-resolved.service(8)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/resolved
# This is pulled in by systemd-resolved.service, since it cannot run
# without its policy set. However, let's conditionalize this unit on
# non-kdbus system.
ConditionPathExists=/sys/fs/kdbus/0-system/
[BusName]
Service=systemd-resolved.service
AllowWorld=talk

5
units/systemd-resolved.service.in
View File

@ -10,6 +10,11 @@ Description=Network Name Resolution
Documentation=man:systemd-resolved.service(8)
After=systemd-networkd.service network.service
# 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
[Service]
Type=notify
Restart=always