- apr_pool_sub_make also fixed

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index d5eb0f1f62b9caae333afb3e8a9c81127e0f97ec..145eef89e92eca7db042b8e2e0bba1fb938492a1 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -23,7 +23,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down httpd
                exit 1
@@ -32,6 +32,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -43,7 +44,6 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
                msg_already_running httpd
-               exit 1
        fi
        ;;
   stop)
@@ -54,26 +54,31 @@ case "$1" in
                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd
-               exit 1
        fi
        ;;
   status)
        status httpd
+       RETVAL=$?
        /usr/sbin/httpd -S
-       exit $?
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
-  reload)
-       msg_reloading httpd
-       killproc httpd -HUP
-       RETVAL=$?
+  reload|force-reload)
+       if [ -f /var/lock/subsys/httpd ]; then
+               msg_reloading httpd
+               killproc httpd -HUP
+               RETVAL=$?
+       else
+               msg_not_running httpd >&2
+               RETVAL=7
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
        ;;
 esac