Update OpenSUSE init scripts

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1603 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

2 files changed, 68 insertions, 77 deletions

diff --git a/initscript/suse/avahi-daemon.in b/initscript/suse/avahi-daemon.in
index b364a8c..e1fd201 100644
--- a/initscript/suse/avahi-daemon.in
+++ b/initscript/suse/avahi-daemon.in
@@ -1,10 +1,11 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:       avahi
-# Required-Start: $network dbus
-# Default-Start:  3 5
+# Provides:          avahi
+# Required-Start:    $network $remote_fs dbus
+# Default-Start:     3 5
 # Default-Stop:
-# Description: Avahi, a ZeroConf daemon for mDNS and service registration
+# Short-Description: ZeroConf daemon
+# Description:       Avahi, a ZeroConf daemon for mDNS and service registration
 ### END INIT INFO
 
 AVAHI_BIN=@sbindir@/avahi-daemon
@@ -14,43 +15,33 @@ test -x $AVAHI_BIN || exit 5
 rc_reset
 
 case "$1" in
-    start)
-        echo -n "Starting Avahi daemon"
-        /sbin/startproc $AVAHI_BIN -D
-	rc_check
-	for (( n=0 ; n<10 ; n++ )) ; do
-	    if test -f /var/run/avahi-daemon/pid ; then
-		break
-	    else
-		echo -n "."
-		sleep 1
-	    fi
-	done
-	rc_status -v
-        ;;
-    stop)
-        echo -n "Shutting down Avahi daemon"
-        $AVAHI_BIN -k || /bin/true
-	rc_status -v
-        ;;
-    restart)
-        $0 stop
-        $0 start
-	rc_status
-        ;;
-    force-reload|reload)
-        echo -n "Reloading Avahi daemon"
-        $AVAHI_BIN -r
-	rc_status -v
-        ;;
-    status)
-        echo -n "Checking for Avahi daemon: "
-        $AVAHI_BIN -c
-        rc_status -v
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
-        exit 1
-        ;;
+	start)
+		echo -n "Starting Avahi daemon "
+		$AVAHI_BIN -D
+		rc_status -v
+		;;
+	stop)
+		echo -n "Shutting down Avahi daemon "
+		$AVAHI_BIN -k 2>/dev/null || /bin/true
+		rc_status -v
+		;;
+	restart)
+		$0 stop
+		$0 start
+		rc_status
+		;;
+	force-reload|reload)
+		echo -n "Reloading Avahi daemon "
+		$AVAHI_BIN -r
+		rc_status -v
+		;;
+	status)
+		echo -n "Checking for Avahi daemon: "
+		$AVAHI_BIN -c
+		rc_status -v
+		;;
+	*)
+		echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+		exit 1
+		;;
 esac
-
diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in
index b9de808..e633b8d 100644
--- a/initscript/suse/avahi-dnsconfd.in
+++ b/initscript/suse/avahi-dnsconfd.in
@@ -1,10 +1,11 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:       avahi-dnsconfd
-# Required-Start: avahi
-# Default-Start:  3 5
+# Provides:          avahi-dnsconfd
+# Required-Start:    $remote_fs avahi
+# Default-Start:     3 5
 # Default-Stop:
-# Description: Avahi, a ZeroConf daemon for mDNS and service registration
+# Short-Description: ZeroConf daemon
+# Description:       Avahi, a ZeroConf daemon for mDNS and service registration
 ### END INIT INFO
 
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
@@ -14,34 +15,33 @@ test -x $AVAHI_BIN || exit 5
 rc_reset
 
 case "$1" in
-    start)
-        echo -n "Starting Avahi DNS Configuration daemon"
-        /sbin/startproc $AVAHI_BIN -D
-	rc_status -v
-        ;;
-    stop)
-        echo -n "Shutting down Avahi DNS Configuration daemon"
-        $AVAHI_BIN -k || /bin/true
-	rc_status -v
-        ;;
-    restart)
-        $0 stop
-        $0 start
-	rc_status
-        ;;
-    force-reload|reload)
-        echo -n "Reloading Avahi DNS Configuration daemon"
-        $AVAHI_BIN -r
-	rc_status -v
-        ;;
-    status)
-        echo -n "Checking for Avahi DNS Configuration daemon: "
-        $AVAHI_BIN -c
-        rc_status -v
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
-        exit 1
-        ;;
+	start)
+		echo -n "Starting Avahi DNS Configuration daemon "
+		$AVAHI_BIN -D
+		rc_status -v
+		;;
+	stop)
+		echo -n "Shutting down Avahi DNS Configuration daemon "
+		$AVAHI_BIN -k 2>/dev/null || /bin/true
+		rc_status -v
+		;;
+	restart)
+		$0 stop
+		$0 start
+		rc_status
+		;;
+	force-reload|reload)
+		echo -n "Reloading Avahi DNS Configuration daemon "
+		$AVAHI_BIN -r
+		rc_status -v
+		;;
+	status)
+		echo -n "Checking for Avahi DNS Configuration daemon: "
+		$AVAHI_BIN -c
+		rc_status -v
+		;;
+	*)
+		echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+		exit 1
+		;;
 esac
-