X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsystemd-networkd.service.in;h=fe92da21235f14aff3f73a4b888c031d2e79eb9e;hp=373ac4e0fd1905eea4fa7ed6e531eeaa04b64649;hb=ebf4e8013b2928fdcfa6008ee6559e8c7e1fd60b;hpb=1b8689f94983b47bf190e77ddb03a8fc6af15fb3

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 373ac4e0f..fe92da212 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -8,11 +8,14 @@
 [Unit]
 Description=Network Service
 Documentation=man:systemd-networkd.service(8)
+ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
-After=dbus.service
-Before=network.target
+# dbus.service can be dropped once on kdbus, and systemd-udevd.service can be
+# dropped once tuntap is moved to netlink
+After=systemd-udevd.service dbus.service network-pre.target systemd-sysusers.service
+Before=network.target multi-user.target shutdown.target
+Conflicts=shutdown.target
 Wants=network.target
-ConditionCapability=CAP_NET_ADMIN
 
 [Service]
 Type=notify
@@ -25,5 +28,4 @@ ProtectHome=yes
 WatchdogSec=1min
 
 [Install]
-Also=systemd-networkd-wait-online.service
 WantedBy=multi-user.target