From 9623ccf70221f81861a42cac1eb372d77ea40ba9 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 26 May 2013 17:40:58 +1000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../resolvconf/resolvconf_1.72.bb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/resolvconf') 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 () { } do_install () { - install -d ${D}${sysconfdir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \ + > ${D}${sysconfdir}/default/volatiles/99_resolvconf + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN}/interface - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf + fi + install -d ${D}${sysconfdir}/${BPN} + ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + install -d ${D}${sysconfdir} ${D}${base_sbindir} install -d ${D}${mandir}/man8 ${D}${docdir}/${P} cp -pPR etc/* ${D}${sysconfdir}/ chown -R root:root ${D}${sysconfdir}/ @@ -31,3 +41,13 @@ do_install () { install -m 0644 README ${D}${docdir}/${P}/ install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ } + +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} -- cgit v1.2.3-54-g00ecf