packages: spamass-milter/spamass-milter.init - updated a little from clamav...

[hawk]

Author: hawk                         Date: Thu Jul 14 21:53:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated a little from clamav-milter init script

---- Files affected:
packages/spamass-milter:
   spamass-milter.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/spamass-milter/spamass-milter.init
diff -u packages/spamass-milter/spamass-milter.init:1.4 packages/spamass-milter/spamass-milter.init:1.5
--- packages/spamass-milter/spamass-milter.init:1.4	Thu Jul 14 21:46:34 2011
+++ packages/spamass-milter/spamass-milter.init	Thu Jul 14 23:52:56 2011
@@ -23,16 +23,9 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/spamass-milter ]; then
 		msg_starting spamass-milter
-		busy
-		MSG="`/usr/sbin/spamass-milter -p $SPAMASS_MILTER_SOCKET -g $SPAMASS_MILTER_SOCKET_GROUP -P $SPAMASS_MILTER_PIDFILE -r $SPAMASS_MILTER_REJECT_SCORE $SPAMASS_MILTER_OPTIONS -f 2>&1`"
-		if [ $? -eq 0 ]; then
-			ok
-			touch /var/lock/subsys/spamass-milter
-		else
-			RETVAL=1
-			fail
-			echo "$MSG"
-		fi
+		daemon /usr/sbin/spamass-milter -f -p $SPAMASS_MILTER_SOCKET -g $SPAMASS_MILTER_SOCKET_GROUP -P $SPAMASS_MILTER_PIDFILE -r $SPAMASS_MILTER_REJECT_SCORE $SPAMASS_MILTER_OPTIONS
+		RETVAL=$?
+                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamass-milter
 	else
 		msg_already_running spamass-milter
 	fi
@@ -41,15 +34,8 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/spamass-milter ]; then
 		msg_stopping spamass-milter
-		busy
-		MSG="`killproc spamass-milter 2>&1`"
-		if [ $? -eq 0 ]; then
-			ok
-		else
-			fail
-			echo "$MSG"
-		fi
-		rm -f /var/lock/subsys/spamass-milter
+		killproc spamass-milter 2>&1
+		rm -f /var/lock/subsys/spamass-milter >/dev/null 2>&1
 	else
 		msg_not_running spamass-milter
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spamass-milter/spamass-milter.init?r1=1.4&r2=1.5&f=u