summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-28 16:53:13 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-28 16:53:13 +0000
commit5bbdb038623c84946151ad386c7e60ff2da42b45 (patch)
treef845f5babe54fd543d484a4368d2052c5ffd9e57 /meta/packages
parent9ec8368091f174680f000b991e8bb3dd35a1ed4e (diff)
downloadopenembedded-core-5bbdb038623c84946151ad386c7e60ff2da42b45.tar.gz
openembedded-core-5bbdb038623c84946151ad386c7e60ff2da42b45.tar.bz2
openembedded-core-5bbdb038623c84946151ad386c7e60ff2da42b45.tar.xz
openembedded-core-5bbdb038623c84946151ad386c7e60ff2da42b45.zip
avahi: Remove startup warning if dbus isn't setup yet
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@581 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/avahi/avahi_0.6.10.bb10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/packages/avahi/avahi_0.6.10.bb b/meta/packages/avahi/avahi_0.6.10.bb
index 2b12d91c8..2a6eb2403 100644
--- a/meta/packages/avahi/avahi_0.6.10.bb
+++ b/meta/packages/avahi/avahi_0.6.10.bb
@@ -5,6 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
HOMEPAGE = "http://avahi.org"
MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
LICENSE= "GPL"
+PR = "r1"
DEPENDS = "expat libdaemon dbus"
RRECOMMENDS = "libnss-mdns"
@@ -49,9 +50,16 @@ pkg_postinst_avahi-daemon () {
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
- /etc/init.d/dbus-1 force-reload
+
+ DBUSPID=`pidof dbus-daemon`
+
+ if [ "x$DBUSPID" != "x" ]; then
+ /etc/init.d/dbus-1 force-reload
+ fi
}
+# dbus errors to /dev/null as at the time the postinst runs, dbus might not be setup.
+
pkg_postrm_avahi-daemon () {
deluser avahi || true
delgroup avahi || true