X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;fp=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=32c5955ea39dea995838f10336b61bb6b0b8d5db;hb=7041d2cfbd22c79cfacb09ed59ec1ce3017bb8bb;hp=bb0fc9628f4c2480d1ea6032ede82220c168ab04;hpb=a79c634e93110cd99a99e1efef855b46dc4794d0;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 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/')