- use functions, actually use $RETVAL

Changed files:
    nrpe.init -> 1.4

diff --git a/nrpe.init b/nrpe.init
index 930e8952d1196c3d42ec1584b44d249252856271..2a17434ea8c6b16a0d770fb63f513c8b01bb067e 100644 (file)
--- a/nrpe.init
+++ b/nrpe.init
@@ -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 @@ case "$1" in
        exit 3
 esac
 
-exit 0
+exit $RETVAL