- use functions

- proagate status of both processes in status()

Changed files:
    dkfilter.init -> 1.3

diff --git a/dkfilter.init b/dkfilter.init
index d4a6b0d4f755e7ef1a352fe2725bf31a6b54ea0f..8bcd010d5fef406c16bbe7f3f5d7f0b8e0b26a64 100755 (executable)
--- a/dkfilter.init
+++ b/dkfilter.init
@@ -28,10 +28,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        if [ $START_INBOUND = "yes" ]; then
                # Check if the service is already running?
                if [ ! -f /var/lock/subsys/dkfilter.in ]; then
@@ -69,8 +66,9 @@ case "$1" in
                        msg_already_running dkfilter.out
                fi
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ $START_INBOUND = "yes" ]; then
                if [ -f /var/lock/subsys/dkfilter.in ]; then
@@ -94,16 +92,27 @@ case "$1" in
                        msg_not_running dkfilter.out
                fi
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status dkfilter.in
+       RETVAL=$?
        status dkfilter.out
-       exit $?
+       RET=$?
+       [ $RET -ne 0 ] && RETVAL=$RET
        ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"