Author: glen Date: Sun Dec 12 18:01:46 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- unify, fixes old config i vs f file var mismatch
---- Files affected:
packages/mrtg:
mrtg.init (1.24 -> 1.25)
---- Diffs:
================================================================
Index: packages/mrtg/mrtg.init
diff -u packages/mrtg/mrtg.init:1.24 packages/mrtg/mrtg.init:1.25
--- packages/mrtg/mrtg.init:1.24 Sun Dec 12 18:58:38 2010
+++ packages/mrtg/mrtg.init Sun Dec 12 19:01:38 2010
@@ -40,9 +40,12 @@
# For obsolete multiple configs - to be droped soon:
checkconfigs_old() {
- local rc
+ local rc file f
for file in ${CONFIGS}; do
- run_cmd --user "$DAEMON_USER" "Checking MRTG configuration:
${file}" mrtg --check ${CONFIGDIR}/${file}
+ f=${file##*/}
+ run_cmd --user "$DAEMON_USER" "Checking MRTG configuration:
$file" \
+ mrtg --check ${CONFIGDIR}/$file \
+ --lock-file=/var/run/mrtg/$f_l \
rc=$?
if [ $rc -ne 0 -a $RETVAL -eq 0 ]; then
RETVAL=$rc
@@ -57,29 +60,31 @@
return
fi
+ local file f closefds
if [ -z "${CONFIGS}" ]; then
checkconfigs
is_no "$RC_LOGGING" && closefds=--closefds
for file in ${CONFIGDIR}/*.cfg; do
f=${file##*/}
- msg_starting "MRTG (${f})"
- daemon $closefds --user ${DAEMON_USER} /usr/bin/mrtg
${file} --daemon \
- --logging /var/log/mrtg/${f}.log \
- --pid-file=/var/run/mrtg/${f}.pid \
+ msg_starting "MRTG ($f)"
+ daemon $closefds --user "$DAEMON_USER" /usr/bin/mrtg
$file --daemon \
+ --logging /var/log/mrtg/$f.log \
+ --pid-file=/var/run/mrtg/$f.pid \
--lock-file=/var/run/mrtg/${f}_l \
- --confcache-file=/var/lib/mrtg/${f}.ok
+ --confcache-file=/var/lib/mrtg/$f.ok
done
else
echo "WARNING: using obsolete CONFIGS definition."
echo "WARNING: look at /etc/sysconfig/mrtg for hints."
checkconfigs_old
- for i in $CONFIGS; do
- msg_starting "MRTG ($i)"
- daemon --user ${DAEMON_USER} /usr/bin/mrtg
$CONFIGDIR/$i --daemon \
- --logging /var/log/mrtg/$i.log \
- --pid-file=/var/run/mrtg/$i.pid \
+ for file in $CONFIGS; do
+ f=${file##*/}
+ msg_starting "MRTG ($f)"
+ daemon --user ${DAEMON_USER} /usr/bin/mrtg
$CONFIGDIR/$file --daemon \
+ --logging /var/log/mrtg/$f.log \
+ --pid-file=/var/run/mrtg/$f.pid \
--lock-file=/var/run/mrtg/${f}_l \
- --confcache-file=/var/lib/mrtg/${f}.ok
+ --confcache-file=/var/lib/mrtg/$f.ok
done
fi
RETVAL=$?
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mrtg/mrtg.init?r1=1.24&r2=1.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
