- dropped pre-cvs changelog

[packages/am-utils.git] / am-utils.init

diff --git a/am-utils.init b/am-utils.init
index 87f3a643e3d77067e7e7bd25fceccf00c2eff0ae..2868beb620c28b1f13b50644b42d1b542eedf9f3 100644 (file)
--- a/am-utils.init
+++ b/am-utils.init
@@ -12,6 +12,11 @@
 # Demon specified configuration.
 . /etc/sysconfig/amd
 
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
+fi
+
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -19,10 +24,10 @@ case "$1" in
        if [ ! -f /var/lock/subsys/amd ]; then
                msg_starting amd
                daemon /usr/sbin/amd -a $ADIR -l syslog $AMDOPTS -c 1000 $MOUNTPTS
-               touch /var/lock/subsys/amd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/amd
        else
                msg_already_running Amavisd
-               exit 1
        fi
        ;;
   stop)
@@ -32,22 +37,30 @@ case "$1" in
                rm -f /var/lock/subsys/amd
        else
                msg_not_running Amavisd
-               exit 1
        fi
        ;;
   status)
        status amd
+       exit $?
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
-  reload)
-       killall -HUP amd
+  reload|force-reload)
+       if [ -f /var/lock/subsys/amd ]; then
+               msg_reloading amd
+               killproc -HUP amd
+               RETVAL=$?
+       else
+               msg_not_running Amavisd >&2
+               RETVAL=7
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
-exit 0
+exit $RETVAL