- use functions

Changed files:
    daemontools.init -> 1.16

diff --git a/daemontools.init b/daemontools.init
index 074a5f0e98b31960c622076517d2e059d29702b0..398f048fb916d58c898d747943098d015c876859 100644 (file)
--- a/daemontools.init
+++ b/daemontools.init
@@ -28,10 +28,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/svscan ]; then
                msg_starting svscan;
@@ -51,8 +48,9 @@ case "$1" in
        else
                msg_already_running svscan
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/svscan ]; then
                msg_stopping svscan
                killproc svscan
@@ -65,11 +63,20 @@ case "$1" in
        else
                msg_not_running svscan
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status svscan