summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2010-09-20 03:33:08 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-24 15:52:22 +0200
commitac6513c0f94e6599d520ca223d25938c79fa7e76 (patch)
treea122a72d6f18a62cfbc29fb63d5aea8e9c560b9c
parentb3fed52894b428cb1df19914da592df9ffc9a2b6 (diff)
init: update the suse initscripts
Here are two patches for avahi. The avahi website is extremly slow today, so I didn't file them. - avahi-fix-howl.pc.patch: fix a small issue introduced in c8eacc0f13f6df529f2f40961e2ddb3a45dc9f93 - avahi-init-lsb.patch: update the suse initscripts, with a patch we've had for a while Cheers, Vincent -- Les gens heureux ne sont pas press├ęs.
-rw-r--r--initscript/suse/avahi-daemon.in15
-rw-r--r--initscript/suse/avahi-dnsconfd.in15
2 files changed, 28 insertions, 2 deletions
diff --git a/initscript/suse/avahi-daemon.in b/initscript/suse/avahi-daemon.in
index 851006c..0dc5f9f 100644
--- a/initscript/suse/avahi-daemon.in
+++ b/initscript/suse/avahi-daemon.in
@@ -2,6 +2,7 @@
### BEGIN INIT INFO
# Provides: avahi
# Required-Start: $network $remote_fs dbus
+# Required-Stop: $network $remote_fs dbus
# Default-Start: 3 5
# Default-Stop:
# Short-Description: ZeroConf daemon
@@ -25,6 +26,18 @@ case "$1" in
$AVAHI_BIN -k 2>/dev/null || /bin/true
rc_status -v
;;
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
+ fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
+ ;;
restart)
$0 stop
$0 start
@@ -41,7 +54,7 @@ case "$1" in
rc_status -v
;;
*)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in
index e633b8d..51100e3 100644
--- a/initscript/suse/avahi-dnsconfd.in
+++ b/initscript/suse/avahi-dnsconfd.in
@@ -2,6 +2,7 @@
### BEGIN INIT INFO
# Provides: avahi-dnsconfd
# Required-Start: $remote_fs avahi
+# Required-Stop: $remote_fs avahi
# Default-Start: 3 5
# Default-Stop:
# Short-Description: ZeroConf daemon
@@ -30,6 +31,18 @@ case "$1" in
$0 start
rc_status
;;
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
+ fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
+ ;;
force-reload|reload)
echo -n "Reloading Avahi DNS Configuration daemon "
$AVAHI_BIN -r
@@ -41,7 +54,7 @@ case "$1" in
rc_status -v
;;
*)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac