- reverted, en_NZ is supported locale

[packages/avahi.git] / avahi-daemon

diff --git a/avahi-daemon b/avahi-daemon
index a9eba7a2157de86775179092857fc7efeba48982..a45cab331e53d9f4a168641a689fc123dd660f9b 100644 (file)
--- a/avahi-daemon
+++ b/avahi-daemon
@@ -26,54 +26,54 @@ else
        exit 0
 fi
 
-
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/avahi-daemon ]; then
                msg_starting avahi-daemon
-               daemon --user avahi avahi-daemon
+               _modprobe capability
+               daemon avahi-daemon -D
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/avahi-daemon
        else
                msg_already_running avahi-daemon
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/avahi-daemon ]; then
                # Stop daemons.
                msg_stopping avahi-daemon
-               killproc avahi-daemon
+               avahi-daemon -k
                rm -f /var/lock/subsys/avahi-daemon
+               ok
        else
                msg_not_running avahi-daemon
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/avahi-daemon ]; then
                msg_reloading avahi-daemon
-               killproc avahi-daemon -HUP
+               avahi-daemon -r
                RETVAL=$?
        else
-               msg_not_running avahi-daemon >&2
+               msg_not_running avahi-daemon
                RETVAL=7
        fi
        ;;
-  force-reload)
-       # if program allows reloading without stopping
-       $0 reload
-
-       # or if it doesn't
-       $0 restart
-
-       exit $?
-       ;;
   status)
        status avahi-daemon
        RETVAL=$?
@@ -84,6 +84,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4