- allow some actions when network is down

[packages/daemontools.git] / daemontools.init

diff --git a/daemontools.init b/daemontools.init
index 27c469cea0184aee52f19f686ecbbac76134bb53..b942ab3e0f8f53aab1bdc83ff03171dbb1850873 100644 (file)
--- a/daemontools.init
+++ b/daemontools.init
@@ -19,12 +19,16 @@
 [ -f /etc/sysconfig/svscan ] && . /etc/sysconfig/svscan
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down svscan
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a != stop -a != status ]; then
+               msg_network_down svscan
+               exit 1
+       fi
+else
+       exit 0
 fi
                        
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -37,17 +41,15 @@ case "$1" in
                if [ -w $SVSCAN_DIR ]; then
                        svscan $SVSCAN_DIR &
                        ok
-                       RETVAL=0
                else
                        fail
-                       nls "Missing service directory!"
+                       echo $(nls "Missing service directory")'!'
                        nls "Create %s first." "$SVSCAN_DIR"
                        RETVAL=1
                fi
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/svscan
        else
                msg_already_running svscan
-               exit 1
        fi
        ;;
   stop)
@@ -59,20 +61,20 @@ case "$1" in
                rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
        else
                msg_not_running svscan
-               exit 1
        fi      
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status svscan
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL