X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=467c219aecbae7265a78ba1450fc5782b8187fb2;hb=b3923761df2779305961f11dc4e953dc31624f00;hp=9d04d45f54de2999f836f3648a510feb6505c060;hpb=75b1aaaaaaa3f9f46afa0c52e5c1d220ec628a9d;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index 9d04d45..467c219 100755
--- a/dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/dsa-nagios-checks/checks/dsa-check-running-kernel
@@ -3,9 +3,9 @@
 # Check if the running kernel has the same version string as the on-disk
 # kernel image.
 
-# Copyright 2008,2009,2011 Peter Palfrader
+# Copyright 2008,2009,2011,2012,2013,2014 Peter Palfrader
 # Copyright 2009 Stephen Gran
-# Copyright 2010 Uli Martens
+# Copyright 2010,2012,2013 Uli Martens
 # Copyright 2011 Alexander Reichle-Schmehl
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -37,13 +37,13 @@ get_offset() {
 
 	file="$1"
 	needle="$2"
+
 	perl -e '
 		undef $/;
-		$i = index(<>, "'"$needle"'");
-		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() {
@@ -57,12 +57,14 @@ get_avail() {
 
 	# DSA uses kernel versions of the form 2.6.29.3-dsa-dl380-oldxeon, where
 	# Debian uses versions of the form 2.6.29-2-amd64
-	if [ "${kervers#3}" != "$kervers" ]; then
-		metavers=$(echo $kervers | sed -r -e 's/^3\.[0-9].[0-9]+-[A-Za-z0-9\.]+-(.*)/\1/')
-	elif [ "${kervers//dsa}" != "$kervers" ]; then
-		metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+([\.0-9]+?)-(.*)/2.\1-\3/')
+	if [ "${kervers#2}" != "$kervers" ]; then
+		if [ "${kervers//dsa}" != "$kervers" ]; then
+			metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+([\.0-9]+?)-(.*)/2.\1-\3/')
+		else
+			metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+-[A-Za-z0-9\.]+-(.*)/2.\1-\2/')
+		fi
 	else
-		metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+-[A-Za-z0-9\.]+-(.*)/2.\1-\2/')
+		metavers=$(echo $kervers | sed -r -e 's/^[0-9]+\.[0-9]+(\.[0-9])?+-[A-Za-z0-9\.]+-(.*)/\2/')
 	fi
 
 	# Attempt to track back to a metapackage failed.  bail
@@ -111,50 +113,46 @@ get_avail() {
 	fi
 
 	local availvrs=$(apt-cache policy ${imagename} 2>/dev/null | grep '^  Candidate' | awk '{print $2}')
-	local kernelversion=$(apt-cache policy ${prefix}-image-${kervers} 2>/dev/null | grep '^  Installed:' | awk '{print $2}')
-
-	if [ "$availvrs" = "$kernelversion" ]; then
-		return 0
-	fi
+	local kernelversion
+	for kernelversion in $(apt-cache policy ${prefix}-image-${kervers} ${prefix}-image-${kervers}-unsigned 2>/dev/null | grep '^  Installed:' | awk '{print $2}' | grep -F -v '(none)' ); do
+		if [ "$availvrs" = "$kernelversion" ]; then
+			return 0
+		fi
+	done
 
 	echo "$kernelversion != $availvrs"
 	return 1
 }
 
-get_image_linux() {
-	local image GZHDR1 GZHDR2 LZHDR off
+cat_vmlinux() {
+	local image header filter hdroff
 
 	image="$1"
+	header="$2"
+	filter="$3"
+	hdroff="$4"
+
+	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
+	done
+}
 
-	GZHDR1="\x1f\x8b\x08\x00"
-	GZHDR2="\x1f\x8b\x08\x08"
-	LZHDR1="\x00\x00\x00\x02\xff"
-	LZHDR2="\x00\x00\x00\x04\xff"
+get_image_linux() {
+	local image
 
-	off=`get_offset "$image" $GZHDR1`
-	[ "$?" != "0" ] && off="-1"
-	if [ "$off" -eq "-1" ]; then
-		off=`get_offset "$image" $GZHDR2`
-		[ "$?" != "0" ] && off="-1"
-	fi
-	if [ "$off" -eq "0" ]; then
-		zcat < "$image"
-		return
-	elif [ "$off" -ne "-1" ]; then
-		(dd ibs="$off" skip=1 count=0 && dd bs=512k) < "$image"  2>/dev/null | zcat 2>/dev/null
-		return
-	fi
+	image="$1"
 
-	off=`get_offset "$image" $LZHDR1`
-	[ "$?" != "0" ] && off="-1"
-	if [ "$off" -eq "-1" ]; then
-		off=`get_offset "$image" $LZHDR2`
-		[ "$?" != "0" ] && off="-1"
-	fi
-	if [ "$off" -ne "-1" ]; then
-		(dd ibs="$[off-1]" skip=1 count=0 && dd bs=512k) < "$image" 2>/dev/null | xzcat 2>/dev/null
-		return
-	fi
+	# gzip compressed image
+	cat_vmlinux "$image" "\x1f\x8b\x08\x00"      "zcat"   0
+	cat_vmlinux "$image" "\x1f\x8b\x08\x08"      "zcat"   0
+	# lzma compressed image
+	cat_vmlinux "$image" "\x00\x00\x00\x02\xff"  "xzcat" -1
+	cat_vmlinux "$image" "\x00\x00\x00\x04\xff"  "xzcat" -1
+	# xz compressed image
+	cat_vmlinux "$image" "\xfd\x37\x7a\x58\x5a " "xzcat"  0
 
 	echo "ERROR: Unable to extract kernel image." 2>&1
 	exit 1
@@ -167,15 +165,22 @@ freebsd_check_running_version() {
 	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"
 	fi
 }
 
+STRINGS="";
+if [ -x "$(which strings)" ]; then
+	STRINGS="$(which strings)"
+elif [ -x "$(which busybox)" -a "$( echo foobar | $(which busybox) strings 2>/dev/null)" = "foobar" ]; then
+	STRINGS="$(which busybox) strings"
+fi
+
 searched=""
 for on_disk in \
 	"/boot/vmlinuz-`uname -r`"\
@@ -183,12 +188,12 @@ for on_disk in \
 	"/boot/kfreebsd-`uname -r`.gz"; do
 
 	if [ -e "$on_disk" ]; then
-		if [ ! -x "$(which strings)" ]; then
-			echo "UNKNOWN: 'strings' command missing, perhaps install binutils?"
+		if [ -z "$STRINGS" ]; then
+			echo "UNKNOWN: 'strings' command missing, perhaps install binutils or busybox?"
 			exit $UNKNOWN
 		fi
 		if [ "${on_disk/vmlinu}" != "$on_disk" ]; then
-			on_disk_version="`get_image_linux "$on_disk" | strings | grep 'Linux version' | head -n1`"
+			on_disk_version="`get_image_linux "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
 			if [ -x /usr/bin/lsb_release ] ; then
 				vendor=$(lsb_release -i -s)
 				if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
@@ -196,13 +201,13 @@ for on_disk in \
 				fi
 			fi
 			[ -z "$on_disk_version" ] || break
-			on_disk_version="`cat "$on_disk" | strings | grep 'Linux version' | head -n1`"
+			on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
 			[ -z "$on_disk_version" ] || break
 
 			echo "UNKNOWN: Failed to get a version string from image $on_disk"
 			exit $UNKNOWN
 		else
-			on_disk_version="$(zcat $on_disk | strings | grep Debian | head -n 1 | sed -e 's/Debian [[:alnum:]]\+ (\(.*\))/\1/')"
+			on_disk_version="$(zcat $on_disk | $STRINGS | grep Debian | head -n 1 | sed -e 's/Debian [[:alnum:]]\+ (\(.*\))/\1/')"
 		fi
 	fi
 	searched="$searched $on_disk"