projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ peter@palfrader.org-20090329124344-ga6zcabja5hugi5y]
[mirror/dsa-nagios.git]
/
dsa-nagios-nrpe-config
/
dsa-update-apt-status
diff --git
a/dsa-nagios-nrpe-config/dsa-update-apt-status
b/dsa-nagios-nrpe-config/dsa-update-apt-status
index
a6b5b8a
..
3e3acef
100755
(executable)
--- a/
dsa-nagios-nrpe-config/dsa-update-apt-status
+++ b/
dsa-nagios-nrpe-config/dsa-update-apt-status
@@
-23,7
+23,7
@@
run_required() {
local last_mod
last_mod=`stat -c "%Y" "$STATUS"`
now=`date +%s`
local last_mod
last_mod=`stat -c "%Y" "$STATUS"`
now=`date +%s`
- age=$((
"$now" - "$last_mod"
))
+ age=$((
$now - $last_mod
))
[ "$age" -gt "$MAX_AGE" ] && return $run
return $norun
[ "$age" -gt "$MAX_AGE" ] && return $run
return $norun
@@
-40,7
+40,7
@@
fi
# run apt-get update, retry a few times if it fails
count=0
while [ "$count" -lt "$UPDATE_RUNS" ]; do
# run apt-get update, retry a few times if it fails
count=0
while [ "$count" -lt "$UPDATE_RUNS" ]; do
- apt-get update -qq
+ apt-get update -qq
>/dev/null >&2
if [ "$?" = "0" ]; then break; fi
sleep $(( $RANDOM % 600 ))
count="$(( $count + 1 ))"
if [ "$?" = "0" ]; then break; fi
sleep $(( $RANDOM % 600 ))
count="$(( $count + 1 ))"
@@
-54,7
+54,8
@@
fi
# run the apt check itself
tmp=`tempfile`
trap "rm -f '$tmp'" exit
# run the apt check itself
tmp=`tempfile`
trap "rm -f '$tmp'" exit
-/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
+#/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
+/usr/lib/nagios/plugins/dsa-check-packages > "$tmp"
result="$?"
case "$result" in
0)
result="$?"
case "$result" in
0)