summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service')
-rw-r--r--poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service3
1 files changed, 2 insertions, 1 deletions
diff --git a/poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service b/poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
index c81bb05ea..389b076c3 100644
--- a/poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
+++ b/poky/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
@@ -4,10 +4,11 @@ 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
-PIDFile=/run/dhcpcd-%I.pid
+PIDFile=/run/dhcpcd/%I.pid
ExecStart=/usr/sbin/dhcpcd -q %I
ExecStop=/usr/sbin/dhcpcd -x %I