ubc-enc2bl10 on stretch

[mirror/dsa-nagios.git] / dsa-nagios-checks / checks / dsa-check-running-kernel

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index 6a6994b..aa6e35b 100755 (executable)
--- 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
@@ -162,9 +164,9 @@ freebsd_check_running_version() {
        local r="$(uname -r)"
        local v="$(uname -v| sed -e 's/^#[0-9]*/&:/')"
 
-       local q='@\(#\)FreeBSD '"$r $v"
+       local q='@(#)FreeBSD '"$r $v"
 
-       if zcat "$imagefile" | $STRINGS | egrep -q "$q"; then
+       if zcat "$imagefile" | $STRINGS | grep -F -q "$q"; then
                echo "OK"
        else
                echo "not OK"