svn commit: samba r16486 - in branches/SAMBA_3_0/packaging: RHEL/setup RedHat-9

[jerry at samba.org]

Author: jerry
Date: 2006-06-23 14:39:40 +0000 (Fri, 23 Jun 2006)
New Revision: 16486

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16486

Log:
fix RedHat init scripts to rely on OS provided killproc() function
Modified:
   branches/SAMBA_3_0/packaging/RHEL/setup/smb.init
   branches/SAMBA_3_0/packaging/RHEL/setup/winbind.init
   branches/SAMBA_3_0/packaging/RedHat-9/smb.init


Changeset:
Modified: branches/SAMBA_3_0/packaging/RHEL/setup/smb.init
===================================================================
--- branches/SAMBA_3_0/packaging/RHEL/setup/smb.init	2006-06-23 12:57:19 UTC (rev 16485)
+++ branches/SAMBA_3_0/packaging/RHEL/setup/smb.init	2006-06-23 14:39:40 UTC (rev 16486)
@@ -71,14 +71,14 @@
 stop() {
 	KIND="SMB"
 	echo -n $"Shutting down $KIND services: "
-	killproc smbd -TERM
+	killproc smbd
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid
 	echo
 	KIND="NMB"
 	if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then
 		echo -n $"Shutting down $KIND services: "
-		killproc nmbd -TERM
+		killproc nmbd 
 		RETVAL2=$?
 		[ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid
 		[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb 

Modified: branches/SAMBA_3_0/packaging/RHEL/setup/winbind.init
===================================================================
--- branches/SAMBA_3_0/packaging/RHEL/setup/winbind.init	2006-06-23 12:57:19 UTC (rev 16485)
+++ branches/SAMBA_3_0/packaging/RHEL/setup/winbind.init	2006-06-23 14:39:40 UTC (rev 16486)
@@ -49,7 +49,7 @@
         echo
 	KIND="Winbind"
 	echo -n $"Shutting down $KIND services: "
-	killproc winbindd -TERM
+	killproc winbindd
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/run/winbindd.pid && rm -f /var/lock/subsys/winbindd
 	echo ""

Modified: branches/SAMBA_3_0/packaging/RedHat-9/smb.init
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat-9/smb.init	2006-06-23 12:57:19 UTC (rev 16485)
+++ branches/SAMBA_3_0/packaging/RedHat-9/smb.init	2006-06-23 14:39:40 UTC (rev 16486)
@@ -30,15 +30,8 @@
   stop)
 	echo -n "Shutting down SMB services: "
 
-	## we have to get all the smbd process here instead of just the
-	## main parent (i.e. killproc) because it can take a long time
-	## for an individual process to process a TERM signal
-	smbdpids=`ps guax | grep smbd | grep -v grep | awk '{print $2}'`
-	for pid in $smbdpids; do
-		kill -TERM $pid
-	done
-	## nmbd is ok to kill using killproc()
-	killproc nmbd -TERM
+	killproc smbd 
+	killproc nmbd 
 	rm -f /var/lock/subsys/smb
 	echo ""
 	;;