* sync fedora/redhat initscripts with fedora/redhat shipped packages

[catta] / initscript / fedora / avahi-dnsconfd.in

diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index 5fbdb01ec68ee283bd393239580d297fd58c6565..deb81fb0d9ef3bd506885be22489bdce415ed5c1 100644 (file)
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -2,7 +2,7 @@
 #
 # avahi-daemon:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 34 66
+# chkconfig: - 34 98 02
 # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
 #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
 #       on the local LAN. This is useful for configuring unicast DNS servers in
@@ -23,11 +23,18 @@ OTHER_AVAHI_OPTS=""
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 test -x $AVAHI_BIN || exit 5
 
+LOCKFILE=/var/lock/subsys/avahi-daemon
+
 start() {
        echo -n $"Starting Avahi DNS daemon... "
         $AVAHI_BIN -D
        RETVAL=$?
-       [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
+       if [ $RETVAL = 0 ]; then
+               touch $LOCKFILE
+               success $"$base startup"
+       else
+               failure $"$base startup"
+       fi
        echo
        return $RETVAL
 }
@@ -36,6 +43,8 @@ stop() {
         echo -n "Shutting down Avahi DNS daemon: "
         $AVAHI_BIN -k
        RETVAL=$?
+       [ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+       rm -f $LOCKFILE
        echo
        return $RETVAL
 }
@@ -76,12 +85,15 @@ case "$1" in
         reload 
        ;;
   condrestart)
-        $AVAHI_BIN -c
-        [ $? = 0 ] && restart || :
+       if [ -f $LOCKFILE ]; then
+               restart
+       fi
        ;;
   *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
        exit 1
+       ;;
 esac
 
 exit $?
+