saving uncommitted changes in /etc prior to emerge run

init.d/apache2

@@ -58,6 +58,7 @@ checkconfd() {
 }
 
 checkconfig() {
+	checkpath --directory /run/apache_ssl_mutex
 	checkconfd || return 1
 
 	${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1
@@ -106,7 +107,7 @@ stop() {
 	${APACHE2} ${APACHE2_OPTS} -k stop
 
 	local i=0 retval=0
-	while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \
+	while ( test -f "${PIDFILE}" || pgrep -P ${PID} apache2 >/dev/null ) \
 		&& [ $i -lt ${TIMEOUT} ]; do
 		sleep 1 && i=$(expr $i + 1)
 	done