diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-09-24 10:41:14 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-24 22:32:44 +0100 |
commit | c02fce3b42513d8c741d74091b20a6a52cea32d2 (patch) | |
tree | 3656f019d4870804e82298fecac9bed51879ce1a /meta | |
parent | b6923b3805ebdfdcfa1312bf5b0f368fe800029c (diff) | |
download | openembedded-core-contrib-c02fce3b42513d8c741d74091b20a6a52cea32d2.tar.gz |
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 <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/dhcpcd.service | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service | 1 |
2 files changed, 2 insertions, 0 deletions
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 |