X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=boa.init;h=ec684c81a6f89f8000c6af38142b4439a229aedd;hb=9fe0283e02dafceb22a610a4922b71d9bc33fd13;hp=cd15e14b2195c08d29e4a758619d173349af64fb;hpb=75edb69470eea80d18299c2cdf5aad353270b089;p=packages%2Fboa.git

diff --git a/boa.init b/boa.init
index cd15e14..ec684c8 100644
--- a/boa.init
+++ b/boa.init
@@ -6,7 +6,7 @@
 # description:	Boa is a World Wide Web server.  It is used to serve \
 #		HTML files and CGI.
 # processname:	boa
-# config:	/etc/httpd/boa.conf
+# config:	/etc/boa.conf
 
 
 # Source function library
@@ -19,12 +19,16 @@
 [ -f /etc/sysconfig/boa ] && . /etc/sysconfig/boa
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-	msg_network_down "Boa httpd"
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down "Boa httpd"
+		exit 1
+	fi
+else
+	exit 0
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -36,48 +40,40 @@ case "$1" in
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/boa
 	else
 		msg_already_running "Boa httpd"
-		exit 1
 	fi
-        ;;
+	;;
   stop)
-        # Stop daemons.
+	# Stop daemons.
 	if [ -f /var/lock/subsys/boa ]; then
 		msg_stopping "Boa httpd"
 		killproc boa
 		rm -f /var/lock/subsys/boa >/dev/null 2>&1
 	else
 		msg_not_running "Boa httpd"
-		exit 1
 	fi	
-        ;;
+	;;
   restart)
-        $0 stop
+	$0 stop
 	$0 start
-        ;;
-  reload)
+	exit $?
+	;;
+  reload|force-reload)
 	if [ -f /var/lock/subsys/boa ]; then
-		msg_show "Boa httpd"
-		msg_reload
-		busy
+		msg_reloading "Boa httpd"
 		killproc boa -HUP
-		deltext
-		ok		
+		RETVAL=$?
 	else
-		msg_not_running "Boa httpd"
-		exit 1
+		msg_not_running "Boa httpd" >&2
+		exit 7
 	fi
 	;;
-  force-reload)
-	$0 reload
-	exit $?
-	;;
   status)
 	status boa
 	exit $?
-        ;;
+	;;
   *)
-	msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
-        exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL