- attempt to quick sync with main init script

Changed files:
    amavisd-new-milter.init -> 1.3

diff --git a/amavisd-new-milter.init b/amavisd-new-milter.init
index fba531916875c241cd80d17ed134be9910a2e2b1..ea4092d6a1551c27ea4548483cf70ec38227281f 100644 (file)
--- a/amavisd-new-milter.init
+++ b/amavisd-new-milter.init
@@ -20,7 +20,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/amavis-milter ]; then
                msg_starting Amavis-milter
-               daemon su amavis -s /bin/sh -c \"/usr/sbin/amavis-milter -p local:/var/spool/amavis/runtime/amavis-milter.sock\"
+               LC_ALL='' LANG='' LC_TYPE='' LC_CTYPE='' daemon su amavis -s /bin/sh -c \"/usr/sbin/amavis-milter -p local:/var/spool/amavis/runtime/amavis-milter.sock\"
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/amavis-milter
        else
@@ -37,17 +37,30 @@ case "$1" in
                 msg_not_running Amavis-milter
         fi
        ;;
-  status)
-       status amavis-milter
-       exit $?
+  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 $?
        ;;
+  status)
+       status amavis-milter
+       exit $?
+       ;;
   *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|force-restart|reload|force-restart|status}"
        exit 3
 esac