packages: mrtg/mrtg.init, mrtg/mrtg.spec - check configs with same user mrt...

[glen]

Author: glen                         Date: Sun Dec 12 17:58:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check configs with same user mrtg will be ran afterwards to catch permission errors

---- Files affected:
packages/mrtg:
   mrtg.init (1.23 -> 1.24) , mrtg.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: packages/mrtg/mrtg.init
diff -u packages/mrtg/mrtg.init:1.23 packages/mrtg/mrtg.init:1.24
--- packages/mrtg/mrtg.init:1.23	Sun Dec 12 18:23:49 2010
+++ packages/mrtg/mrtg.init	Sun Dec 12 18:58:38 2010
@@ -30,7 +30,7 @@
 	local rc
 	for file in ${CONFIGDIR}/*.cfg; do
 		f=${file##*/}
-		run_cmd "Checking MRTG configuration: ${f}" mrtg --check ${file}
+		run_cmd --user "$DAEMON_USER" "Checking MRTG configuration: ${f}" mrtg --check ${file}
 		rc=$?
 		if [ $rc -ne 0 -a $RETVAL -eq 0 ]; then
 			RETVAL=$rc
@@ -42,7 +42,7 @@
 checkconfigs_old() {
 	local rc
 	for file in ${CONFIGS}; do
-		run_cmd "Checking MRTG configuration: ${file}" mrtg --check ${CONFIGDIR}/${file}
+		run_cmd --user "$DAEMON_USER" "Checking MRTG configuration: ${file}" mrtg --check ${CONFIGDIR}/${file}
 		rc=$?
 		if [ $rc -ne 0 -a $RETVAL -eq 0 ]; then
 			RETVAL=$rc
@@ -57,7 +57,7 @@
 		return
 	fi
 
-	if [ ! "${CONFIGS}" ]; then
+	if [ -z "${CONFIGS}" ]; then
 		checkconfigs
 		is_no "$RC_LOGGING" && closefds=--closefds
 		for file in ${CONFIGDIR}/*.cfg; do

================================================================
Index: packages/mrtg/mrtg.spec
diff -u packages/mrtg/mrtg.spec:1.156 packages/mrtg/mrtg.spec:1.157
--- packages/mrtg/mrtg.spec:1.156	Sun Dec 12 18:56:31 2010
+++ packages/mrtg/mrtg.spec	Sun Dec 12 18:58:38 2010
@@ -85,7 +85,7 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
-Requires:	rc-scripts >= 0.2.0
+Requires:	rc-scripts >= 0.4.3.7
 Provides:	mrtg-start
 Obsoletes:	mrtg-cron
 Obsoletes:	mrtg-start
@@ -193,6 +193,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2010/12/12 17:58:38  glen
+- check configs with same user mrtg will be ran afterwards to catch permission errors
+
 Revision 1.156  2010/12/12 17:56:31  glen
 - move cronjob helper scripts to -cron package
 
================================================================

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