X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=df783976a29430921f2e6dd350108f3625a3f164;hb=cf2973bf115ddeb9adb42970d3f01d7d3377f4be;hp=e9ef2efd23c97c60e99c5dae0728d46c5166fe29;hpb=19c20daf48ea4446f007bb48c8f6144498b1799a;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 e9ef2ef..df78397 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 Peter Palfrader
+# Copyright 2008,2009 Peter Palfrader
 # Copyright 2009 Stephen Gran
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -50,7 +50,6 @@ get_avail() {
 	local prefix=linux
 
 	local kervers=$(uname -r)
-	local kernelversion=$(apt-cache policy ${prefix}-image-${kervers} 2>/dev/null | grep '^  Installed:' | awk '{print $2}')
 
 	local metavers=''
 
@@ -62,6 +61,11 @@ get_avail() {
 		metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+-[A-Za-z0-9\.]+-(.*)/2.\1-\2/')
 	fi
 
+	# Attempt to track back to a metapackage failed.  bail
+	if [ "$metavers" = "$kervers" ]; then
+		return 2
+	fi
+
 	# We're just going to give up if we can't find a matching metapackage
 	# I tried being strict once, and it just caused a lot of headaches.  We'll see how
 	# being lax does for us
@@ -77,19 +81,33 @@ get_avail() {
 		return 2
 	fi
 
-	local last=0
-	for vers in $(apt-cache --no-all-versions depends ${prefix}-image-${metavers} | grep Depends | awk '{print $2}' | sort -u); do
-		if dpkg --compare-versions $vers gt $last; then
-			last=$vers
+	if [ "$metaavailvers" != "$metainstavers" ] ; then
+		echo "${prefix}-image-${metavers} $metaavailvers available but $metainstavers installed"
+		return 1
+	fi
+
+	local imagename=0
+	# --no-all-versions show shows only the candidate
+	for vers in $(apt-cache --no-all-versions show ${prefix}-image-${metavers} | egrep '^Depends:' | awk '{print $2}' | sort -u); do
+		if dpkg --compare-versions $vers gt $imagename; then
+			imagename=$vers
 		fi
 	done
-	local imagename=$last
 
 	if [ -z "$imagename" ] || [ "$imagename" = 0 ]; then
 		return 2
 	fi
 
+	if [ "$imagename" != "${prefix}-image-${kervers}" ]; then
+		if dpkg --compare-versions "$imagename" lt "${prefix}-image-${kervers}"; then
+			return 2
+		fi
+		echo "$imagename" != "${prefix}-image-${kervers}"
+		return 1
+	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
@@ -99,7 +117,6 @@ get_avail() {
 	return 1
 }
 
-
 get_image() {
 	local image GZHDR1 GZHDR2 off