- better way (backport from HEAD)

Changed files:
    apache1.init -> 1.8

diff --git a/apache1.init b/apache1.init
index 1e006aef8d13fe560d1ef69b0729a05b5f4477b0..929ffa338d2005d9e880364dd4621359e2b54d5a 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -63,21 +63,23 @@ case "$1" in
        RETVAL=$?
        /usr/sbin/httpd -S
        ;;
-  reload)
+  restart)
+       $0 stop
+       $0 start
+       exit $?
+       ;;
+  reload|force-reload)
        if [ -f /var/lock/subsys/httpd ]; then
                msg_reloading httpd
-               kill -HUP `pidof httpd`
+               killproc httpd -HUP
+               RETVAL=$?
        else
-               msg_not_running httpd
+               msg_not_running httpd >&2
+               RETVAL=7
        fi
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
-       ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 3
        ;;
 esac