SOURCES: nrpe.init - use functions, actually use $RETVAL

[glen]

Author: glen                         Date: Wed Dec 20 00:32:02 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions, actually use $RETVAL

---- Files affected:
SOURCES:
   nrpe.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/nrpe.init
diff -u SOURCES/nrpe.init:1.3 SOURCES/nrpe.init:1.4
--- SOURCES/nrpe.init:1.3	Tue Aug  9 13:30:08 2005
+++ SOURCES/nrpe.init	Wed Dec 20 01:31:56 2006
@@ -10,7 +10,7 @@
 # description:	nrpe is a daemon for a remote nagios server, \
 #		running nagios plugins on this host.
 # processname:	nrpe
-# config:	/usr/local/nagios/etc/nrpe.cfg
+# config:	/etc/nagios/nrpe.cfg
 
 . /etc/rc.d/init.d/functions
 
@@ -20,36 +20,45 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down "nagios NRPE daemon"
+		msg_network_down "Nagios NRPE daemon"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-case "$1" in
-  start)
+start() {
 	if [ -f /var/lock/subsys/nrpe ]; then
-		msg_already_running "nagios NRPE daemon"
+		msg_already_running "Nagios NRPE daemon"
 	else
-		msg_starting "nagios NRPE daemon"
+		msg_starting "Nagios NRPE daemon"
 		daemon nrpe -c /etc/nagios/nrpe.cfg -d
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nrpe
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/nrpe ]; then
-		msg_stopping "nagios NRPE daemon"
+		msg_stopping "Nagios NRPE daemon"
 		killproc nrpe
 		rm -f /var/lock/subsys/nrpe
 	else
-		msg_not_running "nagios NRPE daemon"
+		msg_not_running "Nagios NRPE daemon"
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart|force-reload)
-	$0 stop
-	$0 start
+	stop
+	start
 	;;
   status)
 	status nrpe
@@ -60,4 +69,4 @@
 	exit 3
 esac
 
-exit 0
+exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nrpe.init?r1=1.3&r2=1.4&f=u