From 29cc30c335f522365afb707999b9be05f7ab4d3f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 13 Mar 2017 00:05:41 +0100 Subject: [PATCH] dsa-check-running-kernel: meta package version check, also work on 4.x kernels and later --- dsa-nagios-checks/checks/dsa-check-running-kernel | 12 +++++++----- dsa-nagios-checks/debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel index 80f45bf..aa6e35b 100755 --- a/dsa-nagios-checks/checks/dsa-check-running-kernel +++ b/dsa-nagios-checks/checks/dsa-check-running-kernel @@ -57,12 +57,14 @@ get_avail() { # 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#3}" != "$kervers" ]; then - metavers=$(echo $kervers | sed -r -e 's/^3\.[0-9]+(\.[0-9])?+-[A-Za-z0-9\.]+-(.*)/\2/') - elif [ "${kervers//dsa}" != "$kervers" ]; then - metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+([\.0-9]+?)-(.*)/2.\1-\3/') + if [ "${kervers#2}" != "$kervers" ]; then + if [ "${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/') + fi else - metavers=$(echo $kervers | sed -r -e 's/^2\.(4|6)\.[0-9]+-[A-Za-z0-9\.]+-(.*)/2.\1-\2/') + metavers=$(echo $kervers | sed -r -e 's/^[0-9]+\.[0-9]+(\.[0-9])?+-[A-Za-z0-9\.]+-(.*)/\2/') fi # Attempt to track back to a metapackage failed. bail diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index 40aca93..d343e41 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -5,6 +5,8 @@ dsa-nagios-checks (110) UNRELEASED; urgency=medium dsa-check-backuppg.conf are missing entirely. * dsa-check-file_age: support following symlinks and warning on empty files. * dsa-check-file_age: support multiple files. + * dsa-check-running-kernel: meta package version check, also work on 4.x + kernels and later. -- Peter Palfrader Mon, 23 Jan 2017 14:14:06 +0100 -- 2.20.1