summaryrefslogtreecommitdiff
path: root/packages/avahi
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-08-27 22:43:49 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-08-27 22:43:49 +0000
commit7bf0dd268bab4a134d607422d7ebbae829754394 (patch)
treeafff1ea0275d6e19ebeaff6e4c275799eabf9eff /packages/avahi
parent4301731d62f7c6331685b4fcacfb5aae86d8f243 (diff)
avahi: Fix postinst so we only restart dbus if its already running (it might not have started when the postinst runs)
Diffstat (limited to 'packages/avahi')
-rw-r--r--packages/avahi/avahi_0.6.10.bb10
-rw-r--r--packages/avahi/avahi_0.6.11.bb12
-rw-r--r--packages/avahi/avahi_0.6.12.bb11
-rw-r--r--packages/avahi/avahi_0.6.13.bb11
4 files changed, 37 insertions, 7 deletions
diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
index 2b12d91c8d..803266b6b3 100644
--- a/packages/avahi/avahi_0.6.10.bb
+++ b/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"
@@ -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 () {
diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb
index 2b12d91c8d..cc32ad883f 100644
--- a/packages/avahi/avahi_0.6.11.bb
+++ b/packages/avahi/avahi_0.6.11.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"
@@ -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
}
diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
index 2072c1f6bf..44e7c543ae 100644
--- a/packages/avahi/avahi_0.6.12.bb
+++ b/packages/avahi/avahi_0.6.12.bb
@@ -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 () {
diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb
index 7584a02514..0898bf036c 100644
--- a/packages/avahi/avahi_0.6.13.bb
+++ b/packages/avahi/avahi_0.6.13.bb
@@ -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 () {