SOURCES: apache.init - try without --waitfor

[glen]

Author: glen                         Date: Wed Dec 21 23:04:27 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- try without --waitfor

---- Files affected:
SOURCES:
   apache.init (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.50 SOURCES/apache.init:1.51
--- SOURCES/apache.init:1.50	Thu Dec 22 00:02:04 2005
+++ SOURCES/apache.init	Thu Dec 22 00:04:22 2005
@@ -60,8 +60,7 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/httpd ]; then
 		msg_stopping httpd.${HTTPD_MPM}
-		[ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
-		killproc --pidfile httpd.pid $OPT httpd.${HTTPD_MPM}
+		killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
 		# Delete pidfile only when apache was called successfully
 		if [ $? -eq 0 ]; then
 			rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.50&r2=1.51&f=u