Make init scripts fail faster; patch from scop

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

diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index 6fde0baa299fdfd84de8c662b09ad0e9fa299e6d..284c10bf8d62d568eaa842b18680735ebb0fb8c7 100644 (file)
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -1,31 +1,37 @@
 #! /bin/sh
 #
-# avahi-daemon:       Starts the Avahi dns configuration daemon
+# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 97 02
+# chkconfig: - 96 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 \
 #       a DHCP-like fashion with mDNS.
 # processname: avahi-dnsconfd
-# config: 
+# config:
+
+AVAHI_BIN=@sbindir@/avahi-dnsconfd
+
+if [ "$1" == 'status' ]; then
+    test -x $AVAHI_BIN || exit 4
+else
+    test -x $AVAHI_BIN || exit 5
+fi
 
 OTHER_AVAHI_OPTS=""
 
 # Source function library.
 . /etc/init.d/functions
-
 . /etc/sysconfig/network
 
-# Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
-
-AVAHI_BIN=@sbindir@/avahi-dnsconfd
-test -x $AVAHI_BIN || exit 5
-
 LOCKFILE=/var/lock/subsys/avahi-dnsconfd
 
+base=${0##*/}
+
 start() {
+    # Check that networking is configured.
+    [ ${NETWORKING} = "no" ] && exit 1
+
        echo -n $"Starting Avahi DNS daemon... "
         $AVAHI_BIN -D
        RETVAL=$?
@@ -58,7 +64,6 @@ reload() {
        return $RETVAL
 }
 
-
 restart() {
        stop
        start
@@ -83,7 +88,7 @@ case "$1" in
        restart
        ;;
   reload)
-        reload 
+        reload
        ;;
   condrestart)
        if [ -f $LOCKFILE ]; then
@@ -92,9 +97,8 @@ case "$1" in
        ;;
   *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-       exit 1
+       exit 2
        ;;
 esac
 
 exit $RETVAL
-