From e156d1e788024e7400191f9956b7458b1a0ea781 Mon Sep 17 00:00:00 2001
From: ankry <ankry@pld-linux.org>
Date: Sat, 17 May 2003 21:03:35 +0000
Subject: [PATCH] - LSB compliance

Changed files:
    apache.init -> 1.15
    apache1.init -> 1.4
---
 apache.init  | 23 ++++++++++++++---------
 apache1.init | 12 ++++++------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apache.init b/apache.init
index d5eb0f1..124535f 100644
--- a/apache.init
+++ b/apache.init
@@ -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
 
diff --git a/apache1.init b/apache1.init
index d659c0c..20047dd 100644
--- a/apache1.init
+++ b/apache1.init
@@ -34,6 +34,7 @@ if is_no "${IPV6_NETWORKING}"; then
 	HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -45,7 +46,6 @@ case "$1" in
     		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
 	else
 		msg_already_running httpd
-		exit 1
 	fi
 	;;
   stop)
@@ -56,21 +56,21 @@ 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|reload)
+  restart|force-reload)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 	;;
 esac
 
-- 
2.44.0