SOURCES: sendmail.init - use pidfiles to kill sendmail procs - and...

[glen]

Author: glen                         Date: Thu Dec  1 11:09:30 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use pidfiles to kill sendmail procs
- and client-queue pid was in completely different location
- now service sendmail restart at least works

---- Files affected:
SOURCES:
   sendmail.init (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SOURCES/sendmail.init
diff -u SOURCES/sendmail.init:1.18 SOURCES/sendmail.init:1.19
--- SOURCES/sendmail.init:1.18	Tue Jul 13 14:25:56 2004
+++ SOURCES/sendmail.init	Thu Dec  1 12:09:25 2005
@@ -64,8 +64,6 @@
 	fi
 	if [ ! -f /var/lock/subsys/sm-client ]; then
 		msg_starting sm-client
-		touch /var/run/sm-client.pid
-		chown smmsp:smmsp /var/run/sm-client.pid
 		daemon /usr/sbin/sendmail -L sm-msp-queue -Ac -q$SMQUEUE
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client
@@ -77,16 +75,16 @@
 	if [ -f /var/lock/subsys/sendmail ]; then
 		# Stop daemons.
 		msg_stopping sendmail
-		killproc sendmail
-		rm -f /var/lock/subsys/sendmail
+		killproc --pidfile sendmail.pid sendmail
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	else
 		msg_not_running sendmail
 	fi
 	if [ -f /var/lock/subsys/sm-client ]; then
 		msg_stopping sm-client
-		killproc sendmail
+		killproc --pidfile /var/spool/clientmqueue/sm-client.pid sendmail
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && rm -f /var/run/sm-client.pid
 		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sm-client
 	else
 		msg_not_running sm-client
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sendmail.init?r1=1.18&r2=1.19&f=u