- allow output of configtest success

Changed files:
    nagios.init -> 1.22

diff --git a/nagios.init b/nagios.init
index a159c1fb6d3b3f0a497c19711cac142f1d7e3f40..cd55aec7aec42713709bdd65a46d6ee5ba36b3b7 100644 (file)
--- a/nagios.init
+++ b/nagios.init
@@ -27,12 +27,8 @@ fi
 
 # configtest itself
 configtest() {
-       local rc out
-       out=`/usr/sbin/nagios -v /etc/nagios/nagios.cfg 2>&1`; rc=$?
-       if [ $rc -gt 0 ]; then
-               echo >&2 "$out"
-       fi
-       return $rc
+       /usr/sbin/nagios -v /etc/nagios/nagios.cfg 2>&1
+       return $?
 }
 
 # wrapper for configtest:
@@ -49,8 +45,8 @@ checkconfig() {
                        ok
                else
                        fail
-                       echo >&2 "$out"
                fi
+               [ "$out" ] && echo >&2 "$out"
        else
                # run config test and abort with nice message if failed
                # (for actions checking status before action).
@@ -95,30 +91,30 @@ stop() {
        rm -f /var/lock/subsys/nagios > /dev/null 2>&1
 }
 
-condrestart() {
+reload() {
        if [ ! -f /var/lock/subsys/nagios ]; then
                msg_not_running "Nagios"
-               RETVAL=$1
+               RETVAL=7
                return
        fi
 
        checkconfig
-       stop
-       start
+       msg_reloading "Nagios"
+
+       killproc nagios -HUP
+       RETVAL=$?
 }
 
-reload() {
+condrestart() {
        if [ ! -f /var/lock/subsys/nagios ]; then
                msg_not_running "Nagios"
-               RETVAL=7
+               RETVAL=$1
                return
        fi
 
        checkconfig
-       msg_reloading "Nagios"
-
-       killproc nagios -HUP
-       RETVAL=$?
+       stop
+       start
 }
 
 RETVAL=0
@@ -141,7 +137,7 @@ case "$1" in
   reload|force-reload)
        reload
        ;;
-  checkconfig|check|configtest)
+  checkconfig|configtest)
        checkconfig 1
        ;;
   status)