- todo

[packages/ulogd.git] / ulogd.init

diff --git a/ulogd.init b/ulogd.init
index ebd82e393bd8226e017c0f58e77f44b18b43dcd8..36e9f9feb688abb73c62814cc699c9d68dbe16c1 100644 (file)
--- a/ulogd.init
+++ b/ulogd.init
@@ -14,62 +14,45 @@
 [ -f /usr/sbin/ulogd ] || exit 0
 
 # Get service config
-if [ -f /etc/sysconfig/ulogd ] ; then
-        . /etc/sysconfig/ulogd
+if [ -f /etc/sysconfig/ulogd ]; then
+       . /etc/sysconfig/ulogd
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/ulogd ]; then
-               msg_starting "ulogd"
+               msg_starting ulogd
                daemon ulogd
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ulogd
        else
-               msg_already_running "ulogd"
+               msg_already_running ulogd
        fi
        ;;
-    stop)      
+  stop)
        if [ -f /var/lock/subsys/ulogd ]; then
-               msg_stopping "ulogd"
+               msg_stopping ulogd
                killproc ulogd
                rm -f /var/lock/subsys/ulogd >/dev/null 2>&1
        else
                msg_not_running ulogd
-               exit 1
-       fi      
+       fi
        ;;
   status)
        status ulogd
+       exit $?
        ;;
-  restart)
+  restart|force-reload)
        $0 stop
        $0 start
-       ;;
-  reload)
-       if [ -f /var/lock/subsys/ulogd ]; then
-               msg_reloading "ulogd"
-               $0 stop
-               $0 start
-#              killproc ulogd -HUP
-       else
-               msg_not_running ulogd
-               exit 1
-       fi
-       ;;
-  force-reload)
-       $0 reload
-       exit $?
-
-       # or if it doesn't
-       $0 stop && $0 start
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL