summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-26 17:40:58 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-29 22:07:57 +0100
commit9623ccf70221f81861a42cac1eb372d77ea40ba9 (patch)
treea0fc5fc02f9d279ade3c7aac51b2e0825538a222 /meta
parent4bdb3c586f50adcf3076f1af1fcebf0615faa6bd (diff)
downloadpoky-9623ccf70221f81861a42cac1eb372d77ea40ba9.tar.gz
resolvconf: remove /var/volatile/run/resolvconf/interface from package
- Remove /etc/resolvconf/run/interface from package as it actually uses /etc/resolvconf/run/interface - Create /var/run/resolvconf/interface on startup using populate-volatiles.sh and tmpfiles.d for systemd - Create symbolic link from /etc/resolvconf/run to /var/run/resolvconf (From OE-Core rev: 619d78016be8d47691e3b2d218a6b855364541a3) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb22
1 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
index a96dbff949..4fe70f5216 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
@@ -23,7 +23,17 @@ do_compile () {
23} 23}
24 24
25do_install () { 25do_install () {
26 install -d ${D}${sysconfdir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface 26 install -d ${D}${sysconfdir}/default/volatiles
27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \
28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf
29 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${sysconfdir}/tmpfiles.d
31 echo "d /run/${BPN}/interface - - - -" \
32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
33 fi
34 install -d ${D}${sysconfdir}/${BPN}
35 ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
36 install -d ${D}${sysconfdir} ${D}${base_sbindir}
27 install -d ${D}${mandir}/man8 ${D}${docdir}/${P} 37 install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
28 cp -pPR etc/* ${D}${sysconfdir}/ 38 cp -pPR etc/* ${D}${sysconfdir}/
29 chown -R root:root ${D}${sysconfdir}/ 39 chown -R root:root ${D}${sysconfdir}/
@@ -31,3 +41,13 @@ do_install () {
31 install -m 0644 README ${D}${docdir}/${P}/ 41 install -m 0644 README ${D}${docdir}/${P}/
32 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ 42 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
33} 43}
44
45pkg_postinst_${PN} () {
46 if [ -z "$D" ]; then
47 if command -v systemd-tmpfiles >/dev/null; then
48 systemd-tmpfiles --create
49 elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
50 ${sysconfdir}/init.d/populate-volatile.sh update
51 fi
52 fi
53}