[gentoo-commits] proj/apache:master commit in: 2.2/init/, 2.4/init/

[Lars Wendler]

commit:     42b9eef61847a4a815c5c3d9adb3030e1d3402b9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 08:48:24 2013 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 08:48:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=42b9eef6

Fixed startup of init scripts

---
 2.2/init/apache2.initd |  7 +++++--
 2.4/init/apache2.initd | 17 +++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd
index 002e278..e3bc921 100755
--- a/2.2/init/apache2.initd
+++ b/2.2/init/apache2.initd
@@ -78,9 +78,12 @@ start() {
 	start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
 
 	local i=0 retval=1
-	while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
+	while [ $i -lt ${TIMEOUT} ] ; do
+		if [ -e "${PIDFILE}" ] ; then
+			retval=0
+			break
+		fi
 		sleep 1 && i=$(expr $i + 1)
-		[ -e "${PIDFILE}" ] && retval=0
 	done
 
 	eend ${retval}

diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index a95e41a..cf3936c 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -78,12 +78,16 @@ start() {
 	# Use start stop daemon to apply system limits #347301 
 	start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
 
-	i=0
-	while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
+	local i=0 retval=1
+	while [ $i -lt ${TIMEOUT} ] ; do
+		if [ -e "${PIDFILE}" ] ; then
+			retval=0
+			break
+		fi
 		sleep 1 && i=$(expr $i + 1)
 	done
 
-	eend $(test $i -lt ${TIMEOUT})
+	eend ${retval}
 }
 
 stop() {
@@ -102,13 +106,14 @@ stop() {
 	ebegin "Stopping ${SVCNAME}"
 	${APACHE2} ${APACHE2_OPTS} -k stop
 
-	i=0
-	while ( ! test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \
+	local i=0 retval=0
+	while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \
 		&& [ $i -lt ${TIMEOUT} ]; do
 		sleep 1 && i=$(expr $i + 1)
 	done
+	[ -e "${PIDFILE}" ] && retval=1
 
-	eend $(test $i -lt ${TIMEOUT})
+	eend ${retval}
 }
 
 reload() {