- updated to 20040806 (2.1.0-rc1)

[packages/amavisd-new.git] / amavisd-new.init

diff --git a/amavisd-new.init b/amavisd-new.init
index e9c9d32cfca9d2b6f4e4cf8ae9f1ce07e8d2bd47..c0c9dbfa388894e0fb0228fa4c82b1e495c61b6e 100644 (file)
--- a/amavisd-new.init
+++ b/amavisd-new.init
@@ -17,18 +17,18 @@
 # Get service config
 [ -f /etc/sysconfig/amavisd ] && . /etc/sysconfig/amavisd
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/amavisd ]; then
                msg_starting Amavisd
-               daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd -c /etc/amavisd.conf
-               touch /var/lock/subsys/amavisd
+               LC_ALL='' LANG='' LC_TYPE='' LC_CTYPE='' daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd -c /etc/amavisd.conf
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/amavisd
        else
                msg_already_running Amavisd
-               exit 1
        fi
        ;;
   stop)
@@ -39,22 +39,33 @@ case "$1" in
                 rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
         else
                 msg_not_running Amavisd
-                exit 1
         fi
        ;;
   status)
        status amavisd
+       exit $?
        ;;
-  reload)
-       /usr/sbin/amavisd reload
+  reload|force-reload)
+       if [ -f /var/lock/subsys/amavisd ]; then
+               msg_reloading Amavisd
+               busy
+               LC_ALL='' LANG='' LC_TYPE='' LC_CTYPE='' /usr/sbin/amavisd reload
+               RETVAL=$?
+               ok
+               [ $RETVAL -ne 0 ] && RETVAL=7
+       else
+               msg_not_running Amavisd >&2
+               RETVAL=7
+       fi
        ;;
-  restart)
+  restart|force-restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL