diff options
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 |