mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

units: make networkd pull in its own .busname unit

Browse Source 
The daemon requires the busname unit to operate (on kdbus systems),
since it contains the policy that allows it to acquire its service
name.

This fixes https://bugs.freedesktop.org/show_bug.cgi?id=90287
This commit is contained in:
Tom Gundersen 2015-05-15 22:59:24 +02:00
parent a542c4dc43
commit b5acb956d1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -5920,7 +5920,7 @@ gperf_gperf_sources += \
src/network/networkd-netdev-gperf.gperf
EXTRA_DIST += \
units/systemd-networkd.service.in \
units/systemd-networkd.service.m4.in \
units/systemd-networkd-wait-online.service.in
endif

1
units/.gitignore vendored
View File

@ -48,6 +48,7 @@
/systemd-modules-load.service
/systemd-networkd-wait-online.service
/systemd-networkd.service
/systemd-networkd.service.m4
/systemd-nspawn@.service
/systemd-poweroff.service
/systemd-quotacheck.service

7
units/systemd-networkd.service.in → units/systemd-networkd.service.m4.in
View File

@ -17,6 +17,13 @@ Before=network.target multi-user.target shutdown.target
Conflicts=shutdown.target
Wants=network.target
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.network1.busname
After=org.freedesktop.network1.busname
)m4_dnl
[Service]
Type=notify
Restart=on-failure