X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=a5874dca5a53e41a38dd2210b8c3ca2fc8f3f9a8;hb=73c7a7ba4815d3691cc2a4a3e4d7afd43e0700ed;hp=cb5168b63e234371127c6779bcc42ea81bf17e51;hpb=829d64b47c297462e237f218f7c05d0401f0e25e;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 cb5168b..a5874dc 100755
--- a/dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/dsa-nagios-checks/checks/dsa-check-running-kernel
@@ -3,7 +3,7 @@
 # Check if the running kernel has the same version string as the on-disk
 # kernel image.
 
-# Copyright 2008,2009 Peter Palfrader
+# Copyright 2008,2009,2011 Peter Palfrader
 # Copyright 2009 Stephen Gran
 # Copyright 2010 Uli Martens
 # Copyright 2011 Alexander Reichle-Schmehl
@@ -46,10 +46,10 @@ get_offset() {
 		print $i,"\n"' < "$file"
 }
 
-get_avail_linux() {
+get_avail() {
 	# This is wrong, but leaves room for when we have to care for machines running
 	# myfirstunix-image-0.1-dsa-arm
-	local prefix=linux
+	local prefix="$1"; shift
 
 	local kervers=$(uname -r)
 
@@ -57,7 +57,9 @@ get_avail_linux() {
 
 	# 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//dsa}" != "$kervers" ]; then
+	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/')
 	else
 		metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+-[A-Za-z0-9\.]+-(.*)/2.\1-\2/')
@@ -91,7 +93,7 @@ get_avail_linux() {
 	local imagename=0
 	# --no-all-versions show shows only the candidate
 	for vers in $(apt-cache --no-all-versions show ${prefix}-image-${metavers} | sed -n 's/^Depends: //p' | tr ',' '\n' | tr -d ' ' | grep ${prefix}-image | awk '{print $1}' | sort -u); do
-		if dpkg --compare-versions $vers gt $imagename; then
+		if dpkg --compare-versions "1.$vers" gt "1.$imagename"; then
 			imagename=$vers
 		fi
 	done
@@ -101,7 +103,7 @@ get_avail_linux() {
 	fi
 
 	if [ "$imagename" != "${prefix}-image-${kervers}" ]; then
-		if dpkg --compare-versions "$imagename" lt "${prefix}-image-${kervers}"; then
+		if dpkg --compare-versions 1."$imagename" lt 1."${prefix}-image-${kervers}"; then
 			return 2
 		fi
 		echo "$imagename" != "${prefix}-image-${kervers}"
@@ -145,7 +147,7 @@ get_image_linux() {
 	off=`get_offset "$image" $LZHDR`
 	[ "$?" != "0" ] && off="-1"
 	if [ "$off" -ne "-1" ]; then
-		(dd ibs="$[off-1]" skip=1 count=0 && dd bs=512k) < "$image" 2>/dev/null | lzcat 2>/dev/null
+		(dd ibs="$[off-1]" skip=1 count=0 && dd bs=512k) < "$image" 2>/dev/null | xzcat 2>/dev/null
 		return
 	fi
 
@@ -153,6 +155,22 @@ get_image_linux() {
 	exit 1
 }
 
+
+freebsd_check_running_version() {
+	local imagefile="$1"; shift
+
+	local r="$(uname -r)"
+	local v="$(uname -v| sed -e 's/^#[0-9]*/&:/')"
+
+	local q='@\(#\)FreeBSD '"$r $v"
+
+	if zcat "$imagefile" | strings | egrep -q "$q"; then
+		echo "OK"
+	else
+		echo "not OK"
+	fi
+}
+
 searched=""
 for on_disk in \
 	"/boot/vmlinuz-`uname -r`"\
@@ -202,14 +220,25 @@ if [ "$(uname -s)" = "Linux" ]; then
 		exit $WARNING
 	fi
 
-	ret="$(get_avail_linux)"
+	ret="$(get_avail linux)"
 	if [ $? = 1 ]; then
 		echo "WARNING: Kernel needs upgrade [$ret]"
 		exit $WARNING
 	fi
 else
-	echo "No support for FreeBSD yet"
-	exit $OK
+	image_current=$(freebsd_check_running_version $on_disk)
+	running_version="`uname -s` `uname -r` `uname -v`"
+	if [ "$image_current" != "OK" ]; then
+		approx_time="$(date -d "@`stat -c '%Y' "$on_disk"`" +"%Y-%m-%d %H:%M:%S")"
+		echo "WARNING: Currently running kernel ($running_version) does not match on disk image (~ $approx_time)"
+		exit $WARNING;
+	fi
+
+	ret="$(get_avail linux)"
+	if [ $? = 1 ]; then
+		echo "WARNING: Kernel needs upgrade [$ret]"
+		exit $WARNING
+	fi
 fi
 
 echo "OK: Running kernel matches on disk image: [$running_version]"