]> git.openpandora.org Git - openembedded.git/commitdiff
avahi: Fix postinst so we only restart dbus if its already running (it might not...
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 22:43:49 +0000 (22:43 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 22:43:49 +0000 (22:43 +0000)
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

index 2b12d91c8df492c46b85e737cf5d66d83680037a..803266b6b3b735e569496a9009388ca66e5ae9be 100644 (file)
@@ -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"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 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 () {
index 2b12d91c8df492c46b85e737cf5d66d83680037a..cc32ad883fcf3a9914b0a4f24a701320121dd24f 100644 (file)
@@ -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"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 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
 }
index 2072c1f6bfe373399fdfa0c0dd6dd4dc3489e35b..44e7c543ae3d3ac08c5ebd33b5406ddd9b88559a 100644 (file)
@@ -5,7 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -48,10 +48,17 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 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 () {
index 7584a02514c75781764f9515c831332ae8b9c413..0898bf036c8bf5589d11b3828c9eac7ac2a1bfbe 100644 (file)
@@ -5,7 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -48,6 +48,8 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 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 () {