- 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 f542c4b833640d1d836359a93083193cc17d5db0..c0c9dbfa388894e0fb0228fa4c82b1e495c61b6e 100644 (file)
--- a/amavisd-new.init
+++ b/amavisd-new.init
@@ -24,7 +24,7 @@ case "$1" in
        # 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
+               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
@@ -45,24 +45,26 @@ case "$1" in
        status amavisd
        exit $?
        ;;
-  reload|force-roload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/amavisd ]; then
                msg_reloading Amavisd
-               /usr/sbin/amavisd reload
+               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|force-roload|status}"
+       msg_usage "$0 {start|stop|restart|force-restart|reload|force-reload|status}"
        exit 3
 esac