- cleaning

Changed files:
    distcc.init -> 1.2

diff --git a/distcc.init b/distcc.init
index c2c601430bec327c80cec00f6062e3475a3894e8..b97c7eb5cbbdef96db27897ffd58d4fe85b2c96f 100644 (file)
--- a/distcc.init
+++ b/distcc.init
@@ -20,9 +20,13 @@
 [ -f /etc/sysconfig/distccd ] && . /etc/sysconfig/distccd
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        msg_network_down distccd
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down distccd
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 OPTION1="--daemon"
@@ -39,12 +43,14 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/distccd             
        else
                msg_already_running distccd
+               exit 1
        fi
        ;;
   stop)
-        if [ -f /var/lock/subsys/distccd ]; then
+       if [ -f /var/lock/subsys/distccd ]; then
                msg_stopping distccd
                killproc distccd
+               RETVAL=$?
                rm -f /var/run/distccd.pid /var/lock/subsys/distccd >/dev/null 2>&1
        else
                msg_not_running distccd
@@ -59,12 +65,18 @@ case "$1" in
        status distccd
        exit $?
        ;;
-  reload)
-       msg_reloading distccd
-       killproc distccd -HUP
+  reload|force-reload)
+       if [ -f /var/lock/subsys/distccd ]; then
+               msg_reloading distccd
+               killproc distccd -HUP
+               RETVAL=$?
+       else
+               msg_not_running distccd
+               exit 1
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 1
 esac