From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Apr 2024 15:28:38 +0000 (+0000)
Subject: initscripts: Correctly wait for Apache2 to terminate
X-Git-Tag: v2.29-core186~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1724e5ac0ac4a139e9f7d574129f53a027197676;p=ipfire-2.x.git

initscripts: Correctly wait for Apache2 to terminate

This is achieved by telling killproc which PIDs to wait for.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 18eb86e2f6..e7a62097e1 100644
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -22,6 +22,8 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
+PIDFILE="/var/run/httpd.pid"
+
 generate_certificates() {
 	if [ ! -f "/etc/httpd/server.key" ]; then
 		boot_mesg "Generating HTTPS RSA server key (this will take a moment)..."
@@ -86,8 +88,7 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping Apache daemon..."
-		/usr/sbin/apachectl -k stop
-		evaluate_retval
+		killproc /usr/sbin/httpd
 		;;
 
 	restart)