[oe-commits] org.oe.dev avahi: Fix postinst so we only restart dbus if its already running (it might not have started when the postinst runs)

[rpurdie commit]

avahi: Fix postinst so we only restart dbus if its already running (it might not have started when the postinst runs)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: da1a8e6e9b7bc078c9f3a1616a1299cd7715fcae
ViewMTN: http://monotone.openembedded.org/revision.psp?id=da1a8e6e9b7bc078c9f3a1616a1299cd7715fcae
Files:
1
packages/avahi/avahi_0.6.10.bb
packages/avahi/avahi_0.6.11.bb
packages/avahi/avahi_0.6.12.bb
packages/avahi/avahi_0.6.13.bb
Diffs:

#
# mt diff -r3f653813c4ae2d37bdd951ea3eff88612e0865f2 -rda1a8e6e9b7bc078c9f3a1616a1299cd7715fcae
#
# 
# 
# patch "packages/avahi/avahi_0.6.10.bb"
#  from [de624d4644325964b114e2633eef5fa597a77ce1]
#    to [74ebebffc3038ba89a22ca5508367cb733eb9bb4]
# 
# patch "packages/avahi/avahi_0.6.11.bb"
#  from [de624d4644325964b114e2633eef5fa597a77ce1]
#    to [0ad478938f1023c8e66b58fcb9e5fe1a818fb699]
# 
# patch "packages/avahi/avahi_0.6.12.bb"
#  from [efe1d2587716693944215d0304bcafc250c6d86d]
#    to [a3c6fcc98ee7f4442a673ae5837e779e1617587e]
# 
# patch "packages/avahi/avahi_0.6.13.bb"
#  from [751b7ddacb440e2aea8ec74ade90000fcecb8065]
#    to [608307a85f7966a67162534cec4aa926f88ce112]
# 
============================================================
--- packages/avahi/avahi_0.6.10.bb	de624d4644325964b114e2633eef5fa597a77ce1
+++ packages/avahi/avahi_0.6.10.bb	74ebebffc3038ba89a22ca5508367cb733eb9bb4
@@ -5,6 +5,7 @@ LICENSE= "GPL"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel at gmail.com>"
 LICENSE= "GPL"
+PR = "r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defa
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
@@ -49,7 +52,12 @@ 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
 }
 
 pkg_postrm_avahi-daemon () {
============================================================
--- packages/avahi/avahi_0.6.11.bb	de624d4644325964b114e2633eef5fa597a77ce1
+++ packages/avahi/avahi_0.6.11.bb	0ad478938f1023c8e66b58fcb9e5fe1a818fb699
@@ -5,6 +5,7 @@ LICENSE= "GPL"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel at gmail.com>"
 LICENSE= "GPL"
+PR="r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defa
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
@@ -49,10 +52,15 @@ 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
 }
 
-pkg_postrm_avahi-daemon () {
+_postrm_avahi-daemon () {
 	deluser avahi || true
 	delgroup avahi || true
 }
============================================================
--- packages/avahi/avahi_0.6.12.bb	efe1d2587716693944215d0304bcafc250c6d86d
+++ packages/avahi/avahi_0.6.12.bb	a3c6fcc98ee7f4442a673ae5837e779e1617587e
@@ -5,7 +5,7 @@ LICENSE= "GPL"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel at gmail.com>"
 LICENSE= "GPL"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -48,10 +48,17 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defa
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 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
 }
 
 pkg_postrm_avahi-daemon () {
============================================================
--- packages/avahi/avahi_0.6.13.bb	751b7ddacb440e2aea8ec74ade90000fcecb8065
+++ packages/avahi/avahi_0.6.13.bb	608307a85f7966a67162534cec4aa926f88ce112
@@ -5,7 +5,7 @@ LICENSE= "GPL"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel at gmail.com>"
 LICENSE= "GPL"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -48,6 +48,8 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defa
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	# can't do this offline
 	if [ "x$D" != "x" ]; then
@@ -55,7 +57,12 @@ pkg_postinst_avahi-daemon () {
 	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
-	/etc/init.d/dbus-1 force-reload
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
 }
 
 pkg_postrm_avahi-daemon () {