- use killproc to shutdown apache, otherwise you'll find yourself in situation

  where you can't stop apache (clean way) because your apache config is broken
  due missing apache module api deps and not all modules are rebuilt on
  builders, and you can't install new package updates because upgrade fails
  because apache reload fails because the config is missing.
  see also http://issues.apache.org/bugzilla/show_bug.cgi?id=37966

Changed files:
    apache.init -> 1.49

diff --git a/apache.init b/apache.init
index 0ca66211ac8734f1c2bb485c906e00b9921a13d9..78321d2ee9d83745050ecef693b3429ec5ada60f 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -61,7 +61,7 @@ case "$1" in
        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=
-               daemon $OPT httpd.${HTTPD_MPM} $CFG -k stop
+               killproc --pidfile /var/run/httpd.pid $OPT 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