Patchwork [v3] resolvconf: remove /var/volatile/run/resolvconf/interface from package

login
register
mail settings
Submitter Jonathan Liu
Date May 26, 2013, 1:57 a.m.
Message ID <1369533437-328-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/50523/
State Superseded, archived
Headers show

Comments

Jonathan Liu - May 26, 2013, 1:57 a.m.
- 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 <net147@gmail.com>
---
 meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Jonathan Liu - May 26, 2013, 2:06 a.m.
On 26/05/2013 11:57 AM, Jonathan Liu wrote:
> - 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 <net147@gmail.com>
> ---
>   meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
> index a96dbff..fc12215 100644
> --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
> +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
> @@ -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
Missing creation of ${D}${sysconfdir}/${P} here. Fixed in V4.

Regards,
Jonathan
> +	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}/

Patch

diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
index a96dbff..fc12215 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
@@ -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}/