From: Yi Zhao Date: Thu, 24 Sep 2020 02:41:14 +0000 (+0800) Subject: dhcpcd: set service to conflict with connman X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~10011 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c02fce3b42513d8c741d74091b20a6a52cea32d2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service index 86b5a43c379..bbed6d85c49 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 3543e6c3d20..389b076c382 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