packages: firestarter/firestarter.init - unify with template.init, add try-...

[glen]

Author: glen                         Date: Mon Mar  1 11:26:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify with template.init, add try-restart, drop reload

---- Files affected:
packages/firestarter:
   firestarter.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/firestarter/firestarter.init
diff -u packages/firestarter/firestarter.init:1.3 packages/firestarter/firestarter.init:1.4
--- packages/firestarter/firestarter.init:1.3	Thu Dec  8 02:02:49 2005
+++ packages/firestarter/firestarter.init	Mon Mar  1 12:26:07 2010
@@ -9,102 +9,92 @@
 #
 # $Id$
 
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
 # Get network config
 . /etc/sysconfig/network
 
-FS_CONTROL="/etc/firestarter/firestarter.sh"
+FS_CONTROL=/etc/firestarter/firestarter.sh
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network ]; then
-                msg_network_down firestarter
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down "firestarter"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
+start() {
+	# Check if the service is already running?
+	if [ -f /var/lock/subsys/firestarter ]; then
+		msg_already_running "firestarter"
+		return
+	fi
+
+	msg_starting "firestarter"
+	busy
+	$FS_CONTROL start > /dev/null
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		touch /var/lock/subsys/firestarter
+		ok
+	else
+		fail
+	fi
+}
+
+stop() {
+	if [ -f /var/lock/subsys/firestarter ]; then
+		msg_not_running "firestarter"
+		return
+	fi
+
+	msg_stopping "firestarter"
+	busy
+	$FS_CONTROL stop > /dev/null
+	rm -f /var/lock/subsys/firestarter
+	ok
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/firestarter ]; then
+		msg_not_running "firestarter"
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
 
 # See how we were called.
 case "$1" in
   start)
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/firestarter ]; then
-		msg_starting firestarter
-                busy
-		$FS_CONTROL start > /dev/null
-		RETVAL=$?
-                if [ $RETVAL -eq 0 ]; then
-                    touch /var/lock/subsys/firestarter
-                    ok
-                else
-                    fail
-                fi
-	else
-		msg_already_running firestarter
-	fi
+  	start
 	;;
   stop)
-	if [ -f /var/lock/subsys/firestarter ]; then
-		msg_stopping firestarter
-                busy
-                $FS_CONTROL stop > /dev/null
-		rm -f /var/lock/subsys/firestarter
-                ok
-	else
-		msg_not_running firestarter
-	fi
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
-  reload)
-	if [ -f /var/lock/subsys/firestarter ]; then
-		msg_reloading firestarter
-                busy
-                $FS_CONTROL stop > /dev/null
-		RETVAL=$?
-                if [ ! $RETVAL -eq 0 ]; then
-                    fail
-                    exit $RETVAL
-                fi
-		$FS_CONTROL start > /dev/null
-		RETVAL=$?
-                if [ ! $RETVAL -eq 0 ]; then
-                    fail
-                    exit $RETVAL
-                fi
-                ok
-	else
-		msg_not_running firestarter >&2
-		RETVAL=7
-	fi
+  try-restart)
+	condrestart 0
 	;;
   force-reload)
-	# if program allows reloading without stopping
-	$0 reload
-
-	# or if it doesn't
-	$0 restart
-
-	exit $?
+	condrestart 7
 	;;
   status)
 	status firestarter
 	RETVAL=$?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/firestarter/firestarter.init?r1=1.3&r2=1.4&f=u