From bbca8ff5af3de72736aac442f49f2c4e2985dd02 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 24 Sep 2020 10:41:14 +0800 Subject: dhcpcd: set service to conflict with connman As the default network manager, connman has its own internal DHCP implement. If run dhcpcd and connman simultaneously, they may conflict with each other. (From OE-Core rev: c02fce3b42513d8c741d74091b20a6a52cea32d2) Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/files/dhcpcd.service | 1 + meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service | 1 + 2 files changed, 2 insertions(+) (limited to 'meta/recipes-connectivity/dhcpcd/files') diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service index 86b5a43c37..bbed6d85c4 100644 --- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service +++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service @@ -2,6 +2,7 @@ Description=A minimalistic network configuration daemon with DHCPv4, rdisc and DHCPv6 support Wants=network.target Before=network.target +Conflicts=connman.service [Service] ExecStart=/usr/sbin/dhcpcd -q --nobackground diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service index 3543e6c3d2..389b076c38 100644 --- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service +++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service @@ -4,6 +4,7 @@ Wants=network.target Before=network.target BindsTo=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device +Conflicts=connman.service [Service] Type=forking -- cgit v1.2.3-54-g00ecf