dsa-check-running-kernel: handle -unsigned packages

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index aa6e35b..467c219 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/dsa-nagios-checks/checks/dsa-check-running-kernel
@@ -113,11 +113,12 @@ 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

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index d5718ed..8aff0ec 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,9 +1,11 @@
 dsa-nagios-checks (117) UNRELEASED; urgency=medium
 
+  [ Peter Palfrader ]
   * dsa-check-hpssacli: add --ignore-cache
   * add: dsa-check-unbound-anchors
   * dsa-check-zone-rrsig-expiration-many: fix use of uninitialized value
     with unsigned zones.
+  * dsa-check-running-kernel: handle -unsigned packages
 
   [ Jan Wagner ]
   * update-apt-statusdir, dsa-update-unowned-file-status: