avahi: fix postinst script error

The previous version of dbus-1 will not stop clean if there exists
running 'dbus-daemon --session' in the system.  That will cause the
script to believe it should ask for a force-reload of dbus, which
leads to an error exit because the 'dbus-daemon --system' wasn't
really running.

diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
index 25ca037c04c03ce0f586a987bf00bfcdad1322eb..639f1de34e37e872083697fd5e349146f56ef565 100644 (file)
--- a/packages/avahi/avahi-python_0.6.21.bb
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r7"
+PR = "r8"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""

diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb
index 28d4c0780734c54c5dfb40ae316d0a0ece0b3c1e..4323b49640091c80b2df14659e1bbab7615cc68b 100644 (file)
--- a/packages/avahi/avahi-ui_0.6.21.bb
+++ b/packages/avahi/avahi-ui_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "avahi gtk+"
 

diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 9a0685578ca3b7804b1d07baa171674ddc8f6edc..cbd6ac3d03309e789916cbf88bacc4afecf8a8db 100644 (file)
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -76,10 +76,11 @@ pkg_postinst_avahi-daemon () {
        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`
-
-       if [ "x$DBUSPID" != "x" ]; then
-               /etc/init.d/dbus-1 force-reload
+       DBUSPID="/var/run/dbus/pid"
+       if [ -f $DBUSPID ]; then
+               if ps `cat $DBUSPID` > /dev/null; then
+                       /etc/init.d/dbus-1 force-reload
+               fi
        fi
 }
 

diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 6bc5a7055ddd0d4b41f84dc1789e5e4724c3c9ea..f3e9c6bdee77121ce10d52db89fe9f16d35d92ff 100644 (file)
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"

diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 6bc5a7055ddd0d4b41f84dc1789e5e4724c3c9ea..f3e9c6bdee77121ce10d52db89fe9f16d35d92ff 100644 (file)
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"

diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index c6236ad6d101c942a2c422c3f44ddb2e56255163..04f92f16d5754200abba28852200d4c7cdd74514 100644 (file)
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"

diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index 43c1b15843f86846f6ada66a961c8734837e00f5..f1f82a053a15c22b4a3d80ad223fb145b971f1ed 100644 (file)
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-PR = "r9"
+PR = "r10"
 
 PACKAGES =+ "libavahi-gobject"

diff --git a/packages/avahi/avahi_0.6.23.bb b/packages/avahi/avahi_0.6.23.bb
index 15f56ffa952b9d371e217345e7706ae1a8a4e66e..61a62a54a4f1477de55ce3874deb7ce9f941ca0c 100644 (file)
--- a/packages/avahi/avahi_0.6.23.bb
+++ b/packages/avahi/avahi_0.6.23.bb
@@ -1,5 +1,7 @@
 require avahi.inc
 
+PR = "r1"
+
 DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"