packages: mrtg/mrtg.init - check all configs before failing out

glen glen at pld-linux.org
Sun Dec 12 18:23:54 CET 2010


Author: glen                         Date: Sun Dec 12 17:23:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check all configs before failing out

---- Files affected:
packages/mrtg:
   mrtg.init (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/mrtg/mrtg.init
diff -u packages/mrtg/mrtg.init:1.22 packages/mrtg/mrtg.init:1.23
--- packages/mrtg/mrtg.init:1.22	Sun Dec 12 18:10:12 2010
+++ packages/mrtg/mrtg.init	Sun Dec 12 18:23:49 2010
@@ -27,23 +27,25 @@
 done
 
 checkconfigs() {
+	local rc
 	for file in ${CONFIGDIR}/*.cfg; do
 		f=${file##*/}
 		run_cmd "Checking MRTG configuration: ${f}" mrtg --check ${file}
-		RETVAL=$?
-		if [ $RETVAL -ne 0 ]; then
-			exit 1
+		rc=$?
+		if [ $rc -ne 0 -a $RETVAL -eq 0 ]; then
+			RETVAL=$rc
 		fi
 	done
 }
 
 # For obsolete multiple configs - to be droped soon:
 checkconfigs_old() {
+	local rc
 	for file in ${CONFIGS}; do
 		run_cmd "Checking MRTG configuration: ${file}" mrtg --check ${CONFIGDIR}/${file}
-		RETVAL=$?
-		if [ $RETVAL -ne 0 ]; then
-			exit 1
+		rc=$?
+		if [ $rc -ne 0 -a $RETVAL -eq 0 ]; then
+			RETVAL=$rc
 		fi
 	done
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mrtg/mrtg.init?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list