- use nss_mdns when referring to nss-mdns as that is our package name; rel 3

[packages/avahi.git] / avahi-daemon

diff --git a/avahi-daemon b/avahi-daemon
index a9eba7a2157de86775179092857fc7efeba48982..159066ee6cbfa31c5532b8e743c422b8fabb7fea 100644 (file)
--- a/avahi-daemon
+++ b/avahi-daemon
@@ -19,71 +19,89 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network ]; then
-               msg_network_down avahi-daemon
+               msg_network_down "avahi-daemon"
                exit 1
        fi
 else
        exit 0
 fi
 
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/avahi-daemon ]; then
+               msg_already_running "avahi-daemon"
+               return
+       fi
+
+       msg_starting "avahi-daemon"
+       _modprobe capability
+       daemon /usr/sbin/avahi-daemon -D
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/avahi-daemon
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/avahi-daemon ]; then
+               msg_not_running "avahi-daemon"
+               return
+       fi
+
+       # Stop daemons.
+       msg_stopping "avahi-daemon"
+       avahi-daemon -k
+       rm -f /var/lock/subsys/avahi-daemon
+       ok
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/avahi-daemon ]; then
+               msg_not_running "avahi-daemon"
+               RETVAL=7
+               return
+       fi
+
+       msg_reloading "avahi-daemon"
+       avahi-daemon -r
+       RETVAL=$?
+}
 
+condrestart() {
+       if [ ! -f /var/lock/subsys/avahi-daemon ]; then
+               msg_not_running "avahi-daemon"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
+RETVAL=0
 # See how we were called.
 case "$1" in
   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
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/avahi-daemon
-       else
-               msg_already_running avahi-daemon
-       fi
+       start
        ;;
   stop)
-       if [ -f /var/lock/subsys/avahi-daemon ]; then
-               # Stop daemons.
-               msg_stopping avahi-daemon
-               killproc avahi-daemon
-               rm -f /var/lock/subsys/avahi-daemon
-       else
-               msg_not_running avahi-daemon
-       fi
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
-  reload)
-       if [ -f /var/lock/subsys/avahi-daemon ]; then
-               msg_reloading avahi-daemon
-               killproc avahi-daemon -HUP
-               RETVAL=$?
-       else
-               msg_not_running avahi-daemon >&2
-               RETVAL=7
-       fi
+  try-restart)
+       condrestart 0
        ;;
-  force-reload)
-       # if program allows reloading without stopping
-       $0 reload
-
-       # or if it doesn't
-       $0 restart
-
-       exit $?
+  reload|force-reload)
+       reload
        ;;
   status)
        status avahi-daemon
        RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
        exit 3
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4