Merge pull request #601 from mtomaschewski/wicked-wants

openSUSE · Oct 16, 2015 · 38b609d · 38b609d
2 parents b9edced + 5e35bd6
commit 38b609d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/etc/systemd/wicked.service.in b/etc/systemd/wicked.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=wicked managed network interfaces
-Wants=network.target
+Wants=network.target wickedd.service wickedd-nanny.service
 After=network-pre.target wickedd.service wickedd-nanny.service
 Before=network-online.target network.target
 

diff --git a/etc/systemd/wickedd-auto4.service.in b/etc/systemd/wickedd-auto4.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=wicked AutoIPv4 supplicant service
+Requisite=dbus.service
 After=local-fs.target dbus.service SuSEfirewall2_init.service
 Before=wickedd.service wicked.service network.target
 PartOf=wickedd.service
@@ -14,6 +15,5 @@ StandardError=null
 Restart=on-abort
 
 [Install]
-WantedBy=wickedd.service
 Alias=dbus-org.opensuse.Network.AUTO4.service
 
diff --git a/etc/systemd/wickedd-dhcp4.service.in b/etc/systemd/wickedd-dhcp4.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=wicked DHCPv4 supplicant service
+Requisite=dbus.service
 After=local-fs.target dbus.service SuSEfirewall2_init.service
 Before=wickedd.service wicked.service network.target
 PartOf=wickedd.service
@@ -14,6 +15,5 @@ StandardError=null
 Restart=on-abort
 
 [Install]
-WantedBy=wickedd.service
 Alias=dbus-org.opensuse.Network.DHCP4.service
 
diff --git a/etc/systemd/wickedd-dhcp6.service.in b/etc/systemd/wickedd-dhcp6.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=wicked DHCPv6 supplicant service
+Requisite=dbus.service
 After=local-fs.target dbus.service SuSEfirewall2_init.service
 Before=wickedd.service wicked.service network.target
 PartOf=wickedd.service
@@ -14,6 +15,5 @@ StandardError=null
 Restart=on-abort
 
 [Install]
-WantedBy=wickedd.service
 Alias=dbus-org.opensuse.Network.DHCP6.service
 
diff --git a/etc/systemd/wickedd-nanny.service.in b/etc/systemd/wickedd-nanny.service.in
@@ -1,5 +1,7 @@
 [Unit]
 Description=wicked network nanny service
+Requisite=dbus.service
+Wants=wickedd.service
 After=local-fs.target dbus.service SuSEfirewall2_init.service wickedd.service
 Before=wicked.service network.target
 PartOf=wickedd.service
@@ -14,6 +16,5 @@ StandardError=null
 Restart=on-abort
 
 [Install]
-WantedBy=wickedd.service
 Alias=dbus-org.opensuse.Network.Nanny.service
 
diff --git a/etc/systemd/wickedd.service.in b/etc/systemd/wickedd.service.in
@@ -1,5 +1,7 @@
 [Unit]
 Description=wicked network management service daemon
+Requisite=dbus.service
+Wants=wickedd-dhcp6.service wickedd-dhcp4.service wickedd-auto4.service
 After=local-fs.target dbus.service isdn.service rdma.service SuSEfirewall2_init.service
 Before=wicked.service network.target
 
@@ -13,7 +15,6 @@ StandardError=null
 Restart=on-abort
 
 [Install]
-WantedBy=wicked.service
 Also=wickedd-nanny.service
 Also=wickedd-auto4.service
 Also=wickedd-dhcp4.service