X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=df783976a29430921f2e6dd350108f3625a3f164;hb=d366c9123648841c925ef36a2eca772d24b08cc6;hp=3e35e102b3b21670eae3d9315bf37ccd293b7846;hpb=128fd0d3918b911815a211b6a30d70ad958bdd41;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 3e35e10..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
@@ -81,8 +81,14 @@ get_avail() {
 		return 2
 	fi
 
+	if [ "$metaavailvers" != "$metainstavers" ] ; then
+		echo "${prefix}-image-${metavers} $metaavailvers available but $metainstavers installed"
+		return 1
+	fi
+
 	local imagename=0
-	for vers in $(apt-cache --no-all-versions depends ${prefix}-image-${metavers} | grep Depends | awk '{print $2}' | sort -u); do
+	# --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