libnss-mdns: fix postinst and postrm

Don't blindly add mdns_minimal, instead check for existing
mdns_minimal instances. Fixes continuously appending mdns settings
to nssswitch.conf when upgrading.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 8d2feec7698274f006a9abc33be2c9bfab111db1..5be5e4fa323e7bf9d55004cec6a8ae56781064b3 100644 (file)
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -28,13 +28,16 @@ DEBIANNAME_${PN} = "libnss-mdns"
 RDEPENDS_${PN} = "avahi-daemon"
 
 pkg_postinst_${PN} () {
-       sed -e '/^hosts:/s/\s*\<mdns\>//' \
-               -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns4_minimal [NOTFOUND=return]\3\4 mdns\5/' \
-               -i $D${sysconfdir}/nsswitch.conf
+       sed '
+               /^hosts:/ !b
+               /\<mdns\(4\|6\)\?\(_minimal\)\?\>/ b
+               s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g
+               ' -i $D${sysconfdir}/nsswitch.conf
 }
 
 pkg_prerm_${PN} () {
-       sed -e '/^hosts:/s/\s*\<mdns\>//' \
-               -e '/^hosts:/s/\s*mdns4_minimal\s\+\[NOTFOUND=return\]//' \
-               -i $D${sysconfdir}/nsswitch.conf
+       sed '
+               /^hosts:/ !b
+               s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g
+               ' -i $D${sysconfdir}/nsswitch.conf
 }