<div dir="ltr">Patch ping follow up<br><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 26, 2014 at 10:03 AM, Jate Sujjavanich <span dir="ltr"><<a href="mailto:jatedev@gmail.com" target="_blank">jatedev@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The resolv.conf link generated by initscripts causes a warning with<br>
resolvconf. The resolvconf script expects a different target.<br>
<br>
Use the ALTERNATIVES system to create the link via populate-volatiles.sh.<br>
<br>
Signed-off-by: Jate Sujjavanich <<a href="mailto:jatedev@gmail.com">jatedev@gmail.com</a>><br>
---<br>
.../resolvconf/files/volatiles_resolv-conf | 1 +<br>
.../resolvconf/<a href="http://resolvconf_1.75.bb" target="_blank">resolvconf_1.75.bb</a> | 15 ++++++++++++++-<br>
.../initscripts/initscripts-1.0/volatiles | 1 -<br>
.../initscripts-1.0/volatiles_resolv-conf | 1 +<br>
meta/recipes-core/initscripts/<a href="http://initscripts_1.0.bb" target="_blank">initscripts_1.0.bb</a> | 9 ++++++++-<br>
5 files changed, 24 insertions(+), 3 deletions(-)<br>
create mode 100644 meta/recipes-connectivity/resolvconf/files/volatiles_resolv-conf<br>
create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/volatiles_resolv-conf<br>
<br>
diff --git a/meta/recipes-connectivity/resolvconf/files/volatiles_resolv-conf b/meta/recipes-connectivity/resolvconf/files/volatiles_resolv-conf<br>
new file mode 100644<br>
index 0000000..e58993d<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/resolvconf/files/volatiles_resolv-conf<br>
@@ -0,0 +1 @@<br>
+l root root 0644 /etc/resolv.conf /etc/resolvconf/run/resolv.conf<br>
diff --git a/meta/recipes-connectivity/resolvconf/<a href="http://resolvconf_1.75.bb" target="_blank">resolvconf_1.75.bb</a> b/meta/recipes-connectivity/resolvconf/<a href="http://resolvconf_1.75.bb" target="_blank">resolvconf_1.75.bb</a><br>
index 7310c83..e108516 100644<br>
--- a/meta/recipes-connectivity/resolvconf/<a href="http://resolvconf_1.75.bb" target="_blank">resolvconf_1.75.bb</a><br>
+++ b/meta/recipes-connectivity/resolvconf/<a href="http://resolvconf_1.75.bb" target="_blank">resolvconf_1.75.bb</a><br>
@@ -11,12 +11,16 @@ AUTHOR = "Thomas Hood"<br>
HOMEPAGE = "<a href="http://packages.debian.org/resolvconf" target="_blank">http://packages.debian.org/resolvconf</a>"<br>
RDEPENDS_${PN} = "bash"<br>
<br>
-SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz"<br>
+SRC_URI = "\<br>
+ ${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \<br>
+ file://volatiles_resolv-conf \<br>
+"<br>
<br>
SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56"<br>
SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e"<br>
<br>
inherit allarch<br>
+inherit update-alternatives<br>
<br>
do_compile () {<br>
:<br>
@@ -30,6 +34,10 @@ do_install () {<br>
install -d ${D}${sysconfdir}/tmpfiles.d<br>
echo "d /run/${BPN}/interface - - - -" \<br>
> ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf<br>
+ else<br>
+ # Use a volatiles script to install resolv.conf symlink<br>
+ install -d install -d ${D}${libdir}/${BPN}<br>
+ install -m 0755 ${WORKDIR}/volatiles_resolv-conf ${D}${libdir}/${BPN}/resolv-conf<br>
fi<br>
install -d ${D}${sysconfdir}/${BPN}<br>
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run<br>
@@ -42,6 +50,11 @@ do_install () {<br>
install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/<br>
}<br>
<br>
+ALTERNATIVE_PRIORITY = "100"<br>
+ALTERNATIVE_${PN}_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'resolvconf', d)}"<br>
+ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/default/volatiles/00_resolv-conf"<br>
+ALTERNATIVE_TARGET[resolv-conf] = "${libdir}/${BPN}/resolv-conf"<br>
+<br>
pkg_postinst_${PN} () {<br>
if [ -z "$D" ]; then<br>
if command -v systemd-tmpfiles >/dev/null; then<br>
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles<br>
index 297245d..cd5f1f1 100644<br>
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles<br>
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles<br>
@@ -32,5 +32,4 @@ l root root 1777 /tmp /var/tmp<br>
d root root 0755 /var/lock/subsys none<br>
f root root 0664 /var/log/wtmp none<br>
f root root 0664 /var/run/utmp none<br>
-l root root 0644 /etc/resolv.conf /var/run/resolv.conf<br>
f root root 0644 /var/run/resolv.conf none<br>
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles_resolv-conf b/meta/recipes-core/initscripts/initscripts-1.0/volatiles_resolv-conf<br>
new file mode 100644<br>
index 0000000..ce7122d<br>
--- /dev/null<br>
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles_resolv-conf<br>
@@ -0,0 +1 @@<br>
+l root root 0644 /etc/resolv.conf /var/run/resolv.conf<br>
diff --git a/meta/recipes-core/initscripts/<a href="http://initscripts_1.0.bb" target="_blank">initscripts_1.0.bb</a> b/meta/recipes-core/initscripts/<a href="http://initscripts_1.0.bb" target="_blank">initscripts_1.0.bb</a><br>
index 7273a82..721e258 100644<br>
--- a/meta/recipes-core/initscripts/<a href="http://initscripts_1.0.bb" target="_blank">initscripts_1.0.bb</a><br>
+++ b/meta/recipes-core/initscripts/<a href="http://initscripts_1.0.bb" target="_blank">initscripts_1.0.bb</a><br>
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip<br>
SECTION = "base"<br>
LICENSE = "GPLv2"<br>
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"<br>
-PR = "r155"<br>
+PR = "r156"<br>
<br>
INHIBIT_DEFAULT_DEPS = "1"<br>
<br>
@@ -29,6 +29,7 @@ SRC_URI = "file://functions \<br>
file://populate-volatile.sh \<br>
file://read-only-rootfs-hook.sh \<br>
file://volatiles \<br>
+ file://volatiles_resolv-conf \<br>
file://save-rtc.sh \<br>
file://GPLv2.patch \<br>
file://dmesg.sh \<br>
@@ -45,8 +46,14 @@ DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-sys<br>
<br>
PACKAGES =+ "${PN}-functions"<br>
RDEPENDS_${PN} = "${PN}-functions"<br>
+FILES_${PN} += "${libdir}/${BPN}/"<br>
FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"<br>
<br>
+ALTERNATIVE_PRIORITY_${PN} = "90"<br>
+ALTERNATIVE_${PN} = "resolv-conf"<br>
+ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/default/volatiles/00_resolv-conf"<br>
+ALTERNATIVE_TARGET[resolv-conf] = "${libdir}/${BPN}/resolv-conf"<br>
+<br>
ALTERNATIVE_PRIORITY_${PN}-functions = "90"<br>
ALTERNATIVE_${PN}-functions = "functions"<br>
ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.5<br>
<br>
</font></span></blockquote></div><br></div></div>