X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=amavisd.init;h=742473331899b6a01babfd518510784d722e625c;hb=1e0635eec9ac44615d13a383bfc343bc512364c6;hp=af5a0a5fb64318b177460a6912d9f29d9f63f2da;hpb=6dba43a4b630a964799198c8a945d9f0e87667a5;p=packages%2Famavisd.git

diff --git a/amavisd.init b/amavisd.init
index af5a0a5..7424733 100755
--- a/amavisd.init
+++ b/amavisd.init
@@ -17,19 +17,17 @@
 # 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 su -s amavis -c "/usr/sbin/amavisd"
-		chmod a+w /var/run/amavisd/amavisd.sock
+		daemon 'su -s /bin/sh amavis -c "/bin/nice /usr/sbin/amavisd"'
 		touch /var/lock/subsys/amavisd
 	else
-		msg_Already_Running Amavisd
-		exit 1
+		msg_already_running Amavisd
 	fi
 	;;
   stop)
@@ -39,20 +37,21 @@ case "$1" in
 		killproc amavisd;
                 rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
         else
-                msg_Not_Running Amavisd
-                exit 1
+                msg_not_running Amavisd
         fi
 	;;
   status)
 	status amavisd
+	exit $?
 	;;
-  restart)
+  restart|force-reload)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   *)
-	msg_Usage: "$0 {start|stop|status|restart}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL