From 7041d2cfbd22c79cfacb09ed59ec1ce3017bb8bb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 18 Mar 2012 20:34:52 +0100 Subject: [PATCH] dsa-check-running-kernel: Fix finding meta package for 3.x kernels. --- dsa-nagios-checks/checks/dsa-check-running-kernel | 4 +++- dsa-nagios-checks/debian/changelog | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel index bb0fc96..32c5955 100755 --- a/dsa-nagios-checks/checks/dsa-check-running-kernel +++ b/dsa-nagios-checks/checks/dsa-check-running-kernel @@ -57,7 +57,9 @@ 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//dsa}" != "$kervers" ]; then + if [ "${kervers#3}" != "$kervers" ]; then + metavers=$(echo $kervers | sed -r -e 's/^3\.[0-9].[0-9]+-[A-Za-z0-9\.]+-(.*)/\1/') + elif [ "${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/') diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index aecbd42..527920f 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -10,12 +10,13 @@ dsa-nagios-checks (9X) Xnstable; urgency=low * add dsa-check-crl-expire. * rename checks/dsa-check-backuppg.conf.sample -> etc/dsa-check-backuppg.conf.sample. + * dsa-check-running-kernel: Fix finding meta package for 3.x kernels. [ Stephen Gran ] * dsa-check-udldap-freshness: check new last_update.trace if it exists instead of /var/lib/misc/thishost/passwd.{db,tdb}. - -- Peter Palfrader Sat, 10 Mar 2012 20:50:55 +0100 + -- Peter Palfrader Sun, 18 Mar 2012 20:34:29 +0100 dsa-nagios-checks (92.1) unstable; urgency=low -- 2.20.1