- updated

Changed files:
    am-utils.init -> 1.4

diff --git a/am-utils.init b/am-utils.init
index d671261916d515bcf0d6c3d13b229eea2e8043ce..350035dde97bd967e02b8bac26d00d59fd877eb9 100644 (file)
--- a/am-utils.init
+++ b/am-utils.init
@@ -15,14 +15,25 @@
 # See how we were called.
 case "$1" in
   start)
-       msg_starting amd
-       daemon /usr/sbin/amd -a $ADIR -l syslog $AMDOPTS -c 1000 $MOUNTPTS
-       touch /var/lock/subsys/amd
+       # Check if the service is already running?
+       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
+       else
+               msg_already_running Amavisd
+               exit 1
+       fi
        ;;
   stop)
-       msg_stopping amd
-       killproc amd
-       rm -f /var/lock/subsys/amd
+       if [ -f /var/lock/subsys/amd ]; then
+               msg_stopping amd
+               killproc amd
+               rm -f /var/lock/subsys/amd
+       else
+               msg_not_running Amavisd
+               exit 1
+       fi
        ;;
   status)
        status amd
@@ -40,4 +51,3 @@ case "$1" in
 esac
 
 exit 0
-