SOURCES: nagios.init - alias configtest to checkconfig - cosmetics

glen glen at pld-linux.org
Thu Jul 28 12:15:26 CEST 2005


Author: glen                         Date: Thu Jul 28 10:15:23 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- alias configtest to checkconfig
- cosmetics

---- Files affected:
SOURCES:
   nagios.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/nagios.init
diff -u SOURCES/nagios.init:1.14 SOURCES/nagios.init:1.15
--- SOURCES/nagios.init:1.14	Sun May  8 19:58:38 2005
+++ SOURCES/nagios.init	Thu Jul 28 12:15:18 2005
@@ -26,11 +26,11 @@
 fi
 
 checkconfig() {
-	res=`/usr/sbin/nagios -v /etc/nagios/nagios.cfg`
+	/usr/sbin/nagios -v /etc/nagios/nagios.cfg > /dev/null
 	rc=$?
 	if [ $rc -gt 0 ]; then
 		fail
-		nls 'The configuration is broken. See details with %s "checkconfig"' $0
+		nls 'The configuration is broken. See details with %s "checkconfig"' /etc/rc.d/init.d/nagios
 	fi
 	return $rc
 }
@@ -69,7 +69,7 @@
 	status nagios
 	exit $?
 	;;
-checkconfig|check)
+checkconfig|check|configtest)
 	/usr/sbin/nagios -v /etc/nagios/nagios.cfg
 	exit $?
 	;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios.init?r1=1.14&r2=1.15&f=u




More information about the pld-cvs-commit mailing list