[wicked-devel] [PATCH] service: ensure wicked does not run at the same time as networkd
--- 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@opensuse.org To contact the owner, e-mail: wicked-devel+owner@opensuse.org
On Fri, 20 Feb 2015 13:21:40 +0100 Jan Engelhardt <jengelh@inai.de> wrote:
--- 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
[CUT] Hi! Thanks for you contribution to the wicked project. Would you mind sending this as a Pull Request at http://github.com/openSUSE/wicked/ please? This is the usual way we deal with new patches. -- Best Regards, Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>, Linux System Developer SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 / 90409 Nürnberg / Germany / Phone: +49-911-740 53 - 613 -- To unsubscribe, e-mail: wicked-devel+unsubscribe@opensuse.org To contact the owner, e-mail: wicked-devel+owner@opensuse.org
On Friday 2015-02-20 13:50, Pawel Wieczorkiewicz wrote:
Thanks for you contribution to the wicked project. Would you mind sending this as a Pull Request at http://github.com/openSUSE/wicked/ please?
That requires registration, does it not? -- To unsubscribe, e-mail: wicked-devel+unsubscribe@opensuse.org To contact the owner, e-mail: wicked-devel+owner@opensuse.org
On Fri, 20 Feb 2015 14:40:20 +0100 (CET) Jan Engelhardt <jengelh@inai.de> wrote:
On Friday 2015-02-20 13:50, Pawel Wieczorkiewicz wrote:
Thanks for you contribution to the wicked project. Would you mind sending this as a Pull Request at http://github.com/openSUSE/wicked/ please?
That requires registration, does it not?
Hi, sorry for late response, somehow I lost the track of this issue. Yes, I am afraid it does require that. I can put it into on your behalf if you like. -- Best Regards, Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>, Linux System Developer SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 / 90409 Nürnberg / Germany / Phone: +49-911-740 53 - 613 -- To unsubscribe, e-mail: wicked-devel+unsubscribe@opensuse.org To contact the owner, e-mail: wicked-devel+owner@opensuse.org
On Fri, 20 Feb 2015 14:40:20 +0100 (CET) Jan Engelhardt <jengelh@inai.de> wrote:
On Friday 2015-02-20 13:50, Pawel Wieczorkiewicz wrote:
Thanks for you contribution to the wicked project. Would you mind sending this as a Pull Request at http://github.com/openSUSE/wicked/ please?
That requires registration, does it not?
You can track this here: https://github.com/openSUSE/wicked/pull/522 -- Best Regards, Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>, Linux System Developer SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 / 90409 Nürnberg / Germany / Phone: +49-911-740 53 - 613 -- To unsubscribe, e-mail: wicked-devel+unsubscribe@opensuse.org To contact the owner, e-mail: wicked-devel+owner@opensuse.org
participants (2)
-
Jan Engelhardt -
Pawel Wieczorkiewicz