[oe-commits] org.oe.dev avahi: fix postinst scripts so that they don't break when

[pH5 commit]

avahi: fix postinst scripts so that they don't break when
installing avahi-autoipd  before avahi-daemon

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 43bccbbd564a5aa9bce3a12a96da93ab727d3f45
ViewMTN: http://monotone.openembedded.org/revision.psp?id=43bccbbd564a5aa9bce3a12a96da93ab727d3f45
Files:
1
packages/avahi/avahi.inc
Diffs:

#
# mt diff -re20a695e35e4aeb9b767b10b3b294458356a1896 -r43bccbbd564a5aa9bce3a12a96da93ab727d3f45
#
# 
# 
# patch "packages/avahi/avahi.inc"
#  from [cba7eb6ad856c5b1289061fad4aaed10781f93d3]
#    to [fded6a4ee18c9973fb5c08eda2c6b31cd18c1d5c]
# 
============================================================
--- packages/avahi/avahi.inc	cba7eb6ad856c5b1289061fad4aaed10781f93d3
+++ packages/avahi/avahi.inc	fded6a4ee18c9973fb5c08eda2c6b31cd18c1d5c
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
 AUTHOR = "Lennart Poettering <lennart at poettering.net>"
 HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR="r1"
+PR="r2"
 
 DEPENDS = "expat libdaemon dbus glib-2.0"
 RRECOMMENDS = "libnss-mdns"
@@ -55,8 +55,8 @@ pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+	grep "^avahi:" /etc/group > /dev/null || addgroup avahi
+	grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
 
 	DBUSPID=`pidof dbus-daemon`
 
@@ -70,8 +70,8 @@ pkg_postinst_avahi-autoipd () {
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-	grep avahi-autoipd /etc/group || addgroup avahi-autoipd
-	grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon"
+	grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd
+	grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon"
 }
 
 pkg_postrm_avahi-daemon () {