---
etc/systemd/wicked.service.in | 1 +
etc/systemd/wicked@.service.in | 1 +
etc/systemd/wickedd-auto4.service.in | 1 +
etc/systemd/wickedd-dhcp4.service.in | 1 +
etc/systemd/wickedd-dhcp6.service.in | 1 +
etc/systemd/wickedd-nanny.service.in | 1 +
etc/systemd/wickedd.service.in | 1 +
7 files changed, 7 insertions(+)
diff --git a/etc/systemd/wicked.service.in b/etc/systemd/wicked.service.in
index 7f3aacb..4c6d333 100644
--- a/etc/systemd/wicked.service.in
+++ b/etc/systemd/wicked.service.in
@@ -3,6 +3,7 @@ Description=wicked managed network interfaces
Wants=network.target
After=network-pre.target wickedd.service wickedd-nanny.service
Before=network-online.target network.target
+Conflicts=systemd-networkd.service
[Service]
Type=oneshot
diff --git a/etc/systemd/wicked@.service.in b/etc/systemd/wicked@.service.in
index 3a1ace5..9816606 100644
--- a/etc/systemd/wicked@.service.in
+++ b/etc/systemd/wicked@.service.in
@@ -7,6 +7,7 @@ Description=wicked managed network in stage %i
#Wants=network.target
#Before=network.target
After=wickedd.service
+Conflicts=systemd-networkd.service
[Service]
Type=oneshot
diff --git a/etc/systemd/wickedd-auto4.service.in b/etc/systemd/wickedd-auto4.service.in
index 4ae98a5..b555d13 100644
--- a/etc/systemd/wickedd-auto4.service.in
+++ b/etc/systemd/wickedd-auto4.service.in
@@ -2,6 +2,7 @@
Description=wicked AutoIPv4 supplicant service
After=local-fs.target dbus.service SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
+Conflicts=systemd-networkd.service
PartOf=wickedd.service
[Service]
diff --git a/etc/systemd/wickedd-dhcp4.service.in b/etc/systemd/wickedd-dhcp4.service.in
index 4c1d2e9..9db58af 100644
--- a/etc/systemd/wickedd-dhcp4.service.in
+++ b/etc/systemd/wickedd-dhcp4.service.in
@@ -2,6 +2,7 @@
Description=wicked DHCPv4 supplicant service
After=local-fs.target dbus.service SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
+Conflicts=systemd-networkd.service
PartOf=wickedd.service
[Service]
diff --git a/etc/systemd/wickedd-dhcp6.service.in b/etc/systemd/wickedd-dhcp6.service.in
index f64a398..b85a8db 100644
--- a/etc/systemd/wickedd-dhcp6.service.in
+++ b/etc/systemd/wickedd-dhcp6.service.in
@@ -2,6 +2,7 @@
Description=wicked DHCPv6 supplicant service
After=local-fs.target dbus.service SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
+Conflicts=systemd-networkd.service
PartOf=wickedd.service
[Service]
diff --git a/etc/systemd/wickedd-nanny.service.in b/etc/systemd/wickedd-nanny.service.in
index b75b086..b3bdc4c 100644
--- a/etc/systemd/wickedd-nanny.service.in
+++ b/etc/systemd/wickedd-nanny.service.in
@@ -2,6 +2,7 @@
Description=wicked network nanny service
After=local-fs.target dbus.service SuSEfirewall2_init.service wickedd.service
Before=wicked.service network.target
+Conflicts=systemd-networkd.service
PartOf=wickedd.service
[Service]
diff --git a/etc/systemd/wickedd.service.in b/etc/systemd/wickedd.service.in
index 2d937fb..44182d8 100644
--- a/etc/systemd/wickedd.service.in
+++ b/etc/systemd/wickedd.service.in
@@ -2,6 +2,7 @@
Description=wicked network management service daemon
After=local-fs.target dbus.service isdn.service rdma.service SuSEfirewall2_init.service
Before=wicked.service network.target
+Conflicts=systemd-networkd.service
[Service]
Type=dbus
--
2.1.4
--
To unsubscribe, e-mail: wicked-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: wicked-devel+owner(a)opensuse.org
