summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-03-30 14:22:16 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-03-30 14:22:16 +0000
commit7ef937bdbcf17970532f161b2429f086b28ccb40 (patch)
tree7846066f86efed90beb9a8beba5f1dadecaca6fb
parentcb09656337463d35f4788874f0b3ab540cf1d40d (diff)
avahi: fix postinst scripts so that they don't break when
installing avahi-autoipd before avahi-daemon
-rw-r--r--packages/avahi/avahi.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index fb71361a1d..72583cb7e9 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,7 +4,7 @@ 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 () {