- remove remnants from template.init

[packages/bb4.git] / bb4.init

diff --git a/bb4.init b/bb4.init
index a8fb6a201e0183d933b833d13e4f4573160569f8..b51c5ea5bee47a628c4a2e9bae80364038576dfa 100644 (file)
--- a/bb4.init
+++ b/bb4.init
@@ -16,56 +16,51 @@
 [ -f /etc/sysconfig/bb ] && . /etc/sysconfig/bb
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_network_down bb
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down bb
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/bb ]; then
+       if [ ! -f /var/lock/subsys/bb ]; then
                msg_starting bb
                su - bb -c '/usr/bin/setsid /usr/lib/bb/runbb.sh start' </dev/null >/dev/null 2>&1
-               RETVAL=$?
-               if [ "$RETVAL" = "0" ]; then
-                       ok
-               else
-                       fail
-               fi
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bb
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && ok || fail
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bb
        else
-               msg_already_running bb
-               exit 1
+               msg_already_running bb
        fi
        ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/bb ]; then
-                msg_stopping bb
+               msg_stopping bb
                su - bb -c '/usr/lib/bb/runbb.sh stop' >/dev/null 2>&1
-               if [ "$?" = "0" ]; then
-                       ok
-               else
-                       fail
-               fi
-                rm -f /var/lock/subsys/bb >/dev/null 2>&1
-        else
+               [ $? -eq 0 ] && ok || died
+               rm -f /var/lock/subsys/bb >/dev/null 2>&1
+       else
                msg_not_running bb
-               exit 1
        fi
        ;;
-  restart|reload)
+  status)
+       ;;
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
        ;;
 esac
 
 exit $RETVAL
-