summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-11-06 10:54:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-08 14:03:20 +0000
commit10dc1748bd0786315aa3f42d196186daf202105c (patch)
tree0bbfb1eaac91d98c1c16cd908a107d1e9cd1f2a2
parent29a911b5ff71a9541f28709fd323210cf54a2c1f (diff)
downloadpoky-10dc1748bd0786315aa3f42d196186daf202105c.tar.gz
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. (From OE-Core rev: ed7cdf95f1dcb3df6e954551f9578a8ac15f2795) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb1
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/dhcpcd.service2
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service4
3 files changed, 4 insertions, 3 deletions
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"
34 34
35EXTRA_OECONF = "--enable-ipv4 \ 35EXTRA_OECONF = "--enable-ipv4 \
36 --dbdir=${localstatedir}/lib/${BPN} \ 36 --dbdir=${localstatedir}/lib/${BPN} \
37 --sbindir=${base_sbindir} \
37 --runstatedir=/run \ 38 --runstatedir=/run \
38 --enable-privsep \ 39 --enable-privsep \
39 --privsepuser=dhcpcd \ 40 --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
5Conflicts=connman.service 5Conflicts=connman.service
6 6
7[Service] 7[Service]
8ExecStart=/usr/sbin/dhcpcd -q --nobackground 8ExecStart=/sbin/dhcpcd -q --nobackground
9 9
10[Install] 10[Install]
11WantedBy=multi-user.target 11WantedBy=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
9[Service] 9[Service]
10Type=forking 10Type=forking
11PIDFile=/run/dhcpcd/%I.pid 11PIDFile=/run/dhcpcd/%I.pid
12ExecStart=/usr/sbin/dhcpcd -q %I 12ExecStart=/sbin/dhcpcd -q %I
13ExecStop=/usr/sbin/dhcpcd -x %I 13ExecStop=/sbin/dhcpcd -x %I
14 14
15[Install] 15[Install]
16WantedBy=multi-user.target 16WantedBy=multi-user.target