- updated

Changed files:
    daemontools.init -> 1.7

diff --git a/daemontools.init b/daemontools.init
index f8d98118d0b55bfda935851c493f3011b1edec43..27c469cea0184aee52f19f686ecbbac76134bb53 100644 (file)
--- a/daemontools.init
+++ b/daemontools.init
@@ -2,7 +2,7 @@
 #
 # svscan       svscan (scan and run services)
 #
-# chkconfig:    345 14 89      
+# chkconfig:   345 14 89       
 #
 # description: svscan (scan and run services) is a server part of the daemontools suite.
 #
@@ -20,8 +20,8 @@
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-        msg_network_down svscan
-        exit 1
+       msg_network_down svscan
+       exit 1
 fi
                        
 
@@ -30,37 +30,39 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/svscan ]; then
-               msg_starting svscan; busy
+               msg_starting svscan;
+               busy
                # we can't get status report from background job
-                # but we can only do simple file check
+               # but we can only do simple file check
                if [ -w $SVSCAN_DIR ]; then
                        svscan $SVSCAN_DIR &
                        ok
                        RETVAL=0
                else
                        fail
-                       echo "Missing service directory!"
-                       echo "Create $SVSCAN_DIR first."
-                       RETVAL=1
-                fi
+                       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)
-        if [ -f /var/lock/subsys/svscan ]; then
+       if [ -f /var/lock/subsys/svscan ]; then
                msg_stopping svscan
                killproc svscan
                svc -d -x $SVSCAN_DIR/* \
-                       $(find $SVSCAN_DIR/* -maxdepth 0 -follow -perm -1000|sed s-\$-/log-)
+                   $(find $SVSCAN_DIR/* -maxdepth 0 -follow -perm -1000|sed s-\$-/log-)
                rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
        else
                msg_not_running svscan
                exit 1
        fi      
        ;;
-  restart)
+  restart|reload)
        $0 stop
        $0 start
        ;;
@@ -69,7 +71,7 @@ case "$1" in
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
 esac