Correctly check *candidate* version of kernel metapackage

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index 3e35e10..a82774c 100755 (executable)
--- 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} | grep Depends | awk '{print $2}' | sort -u); do
                if dpkg --compare-versions $vers gt $imagename; then
                        imagename=$vers
                fi

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index c283f7a..07cf006 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,3 +1,11 @@
+dsa-nagios-checks (79) stable; urgency=low
+
+  * dsa-check-running-kernel: Correctly check *candidate* version
+    of kernel metapackage for unsatisfied depends, not the latest
+    metapackage (which might come from a non-default source).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 03 Jul 2009 20:07:13 +0200
+
 dsa-nagios-checks (78) stable; urgency=low
 
   * dsa-check-raid-aacraid: tmp directory in /tmp,