- uses modern gpgme (>= 1.0.0) at last

[packages/anubis.git] / anubis.init

diff --git a/anubis.init b/anubis.init
index 4e4c04392e7acbf2c12c3765087debe71110fe9a..edc44a44bf3f00b95dc5f5f9b18bf41a6436e1b2 100644 (file)
--- a/anubis.init
+++ b/anubis.init
@@ -20,49 +20,52 @@ PROG=$SERVICE
 . /etc/sysconfig/network
 
 # Check that networking is up
-if is_no "$NETWORKING"; then
-       msg_Network_Down $MSG
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down $MSG
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # Get service config
 [ -f "/etc/sysconfig/$SERVICE" ] && . "/etc/sysconfig/$SERVICE"
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        if [ ! -f "$LOCKFILE" ]; then
                msg_starting "$MSG"
-               daemon $PROG
+               daemon $PROG
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch $LOCKFILE
+               [ $RETVAL -eq 0 ] && touch $LOCKFILE
        else
-               msg_Already_Running $MSG
-               exit 1
+               msg_already_running $MSG
        fi
-        ;;
+       ;;
   stop)
        if [ -f "$LOCKFILE" ]; then
                msg_stopping "$MSG"
-               killproc $PROG
+               killproc $PROG
                rm -f $LOCKFILE  >/dev/null 2>&1
        else
-               msg_Not_Running "$MSG"
-               exit 1
-        fi
-        ;;
+               msg_not_running "$MSG"
+       fi
+       ;;
   status)
        status $PROG
        exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       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
-