From ed7cdf95f1dcb3df6e954551f9578a8ac15f2795 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 6 Nov 2020 10:54:26 +0800 Subject: dhcpcd: install dhcpcd to /sbin rather than /usr/sbin The dhcpcd path is hardcoded to /sbin in ifupdown package. Move dhcpcd from /usr/sbin to /sbin to make sure ifup/ifdown can find it when dhcpcd as the dhcp client backend. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb | 1 + meta/recipes-connectivity/dhcpcd/files/dhcpcd.service | 2 +- meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb index e520115f71..c572868c7e 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb @@ -34,6 +34,7 @@ PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" EXTRA_OECONF = "--enable-ipv4 \ --dbdir=${localstatedir}/lib/${BPN} \ + --sbindir=${base_sbindir} \ --runstatedir=/run \ --enable-privsep \ --privsepuser=dhcpcd \ diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service index bbed6d85c4..6c967ddaf0 100644 --- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service +++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service @@ -5,7 +5,7 @@ Before=network.target Conflicts=connman.service [Service] -ExecStart=/usr/sbin/dhcpcd -q --nobackground +ExecStart=/sbin/dhcpcd -q --nobackground [Install] WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service index 389b076c38..845b83b9e5 100644 --- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service +++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service @@ -9,8 +9,8 @@ Conflicts=connman.service [Service] Type=forking PIDFile=/run/dhcpcd/%I.pid -ExecStart=/usr/sbin/dhcpcd -q %I -ExecStop=/usr/sbin/dhcpcd -x %I +ExecStart=/sbin/dhcpcd -q %I +ExecStop=/sbin/dhcpcd -x %I [Install] WantedBy=multi-user.target -- cgit 1.2.3-korg