resolvconf: remove /var/volatile/run/resolvconf/interface from package

PATCH Superseded Jonathan Liu 1 participant 2 messages May 26, 2013

Share & tools

Jonathan Liu

author

2013-05-26 01:44 UTC #0 lore raw

PATCH v3 1/1 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

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb +10 -1

index a96dbff..fc12215 100644
@@ -23,7 +23,16 @@ 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/${P}/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/${P}/interface - - - -" \
+		     > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
+	fi
+	ln -snf ${localstatedir}/run/${P} ${D}${sysconfdir}/${P}/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}/

Signature · 1 line

1.8.2.3

Jonathan Liu

author

2013-05-26 02:10 UTC #1 lore raw

Quoted 19 lines · Jonathan Liu

- 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
Signed-off-by Jonathan Liu <[email protected]>
---
  meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb +0 -0
index a96dbff..fc12215 100644
@@ -23,7 +23,16 @@ do_compile () {
  }
 
  do_install () {

meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb do_compile () { · line 34

Quoted 10 lines

meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb +9 -1

-	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/${P}/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/${P}/interface - - - -" \
+		     > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
+	fi
+	ln -snf ${localstatedir}/run/${P} ${D}${sysconfdir}/${P}/run

Missing creation of ${D}${sysconfdir}/${P} here. Fixed in V4.

Regards,
Jonathan

Quoted 4 lines

meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb +1 -0

+	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}/