projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use PERL_LWP_SSL_CA_PATH not HTTPS_CA_DIR as the latter has issues.
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
checks
/
dsa-check-running-kernel
diff --git
a/dsa-nagios-checks/checks/dsa-check-running-kernel
b/dsa-nagios-checks/checks/dsa-check-running-kernel
index
ae5f8ec
..
80f45bf
100755
(executable)
--- a/
dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/
dsa-nagios-checks/checks/dsa-check-running-kernel
@@
-37,15
+37,13
@@
get_offset() {
file="$1"
needle="$2"
file="$1"
needle="$2"
- pos="$3"
perl -e '
undef $/;
perl -e '
undef $/;
- $i = index(<>, "'"$needle"'", '"$pos"');
- if ($i < 0) {
- exit 1;
- };
- print $i,"\n"' < "$file"
+ $i = 0; $k=<>;
+ while (($i = index($k, "'"$needle"'", $i)) >= 0) {
+ print $i++,"\n";
+ }; ' < "$file"
}
get_avail() {
}
get_avail() {
@@
-130,23
+128,13
@@
cat_vmlinux() {
header="$2"
filter="$3"
hdroff="$4"
header="$2"
filter="$3"
hdroff="$4"
- nextoff=0
-
- while : ; do
- off=`get_offset "$image" $header $nextoff`
- local ret="$?"
- if [ "$ret" != 0 ]; then
- # not found, exit
- return 1
- fi
+ get_offset "$image" $header | head -n 5 | while read off; do
(if [ "$off" != 0 ]; then
dd ibs="$((off+hdroff))" skip=1 count=0
fi &&
dd bs=512k) < "$image" 2>/dev/null | $filter 2>/dev/null
(if [ "$off" != 0 ]; then
dd ibs="$((off+hdroff))" skip=1 count=0
fi &&
dd bs=512k) < "$image" 2>/dev/null | $filter 2>/dev/null
- nextoff=$((off + 1))
done
done
- return 0
}
get_image_linux() {
}
get_image_linux() {
@@
-174,9
+162,9
@@
freebsd_check_running_version() {
local r="$(uname -r)"
local v="$(uname -v| sed -e 's/^#[0-9]*/&:/')"
local r="$(uname -r)"
local v="$(uname -v| sed -e 's/^#[0-9]*/&:/')"
- local q='@
\(#\
)FreeBSD '"$r $v"
+ local q='@
(#
)FreeBSD '"$r $v"
- if zcat "$imagefile" | $STRINGS |
egrep
-q "$q"; then
+ if zcat "$imagefile" | $STRINGS |
grep -F
-q "$q"; then
echo "OK"
else
echo "not OK"
echo "OK"
else
echo "not OK"