From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] initscripts: Correctly wait for Apache2 to terminate Date: Fri, 26 Apr 2024 15:28:38 +0000 Message-ID: <20240426152838.3768448-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2986465556252153831==" List-Id: --===============2986465556252153831== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This is achieved by telling killproc which PIDs to wait for. Signed-off-by: Michael Tremer --- src/initscripts/system/apache | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache index 18eb86e2f..e7a62097e 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) -- 2.39.2 --===============2986465556252153831==--