X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-running-kernel;h=a5874dca5a53e41a38dd2210b8c3ca2fc8f3f9a8;hb=73c7a7ba4815d3691cc2a4a3e4d7afd43e0700ed;hp=32c5955ea39dea995838f10336b61bb6b0b8d5db;hpb=7041d2cfbd22c79cfacb09ed59ec1ce3017bb8bb;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 32c5955..a5874dc 100755 --- a/dsa-nagios-checks/checks/dsa-check-running-kernel +++ b/dsa-nagios-checks/checks/dsa-check-running-kernel @@ -93,7 +93,7 @@ get_avail() { local imagename=0 # --no-all-versions show shows only the candidate for vers in $(apt-cache --no-all-versions show ${prefix}-image-${metavers} | sed -n 's/^Depends: //p' | tr ',' '\n' | tr -d ' ' | grep ${prefix}-image | awk '{print $1}' | sort -u); do - if dpkg --compare-versions $vers gt $imagename; then + if dpkg --compare-versions "1.$vers" gt "1.$imagename"; then imagename=$vers fi done @@ -103,7 +103,7 @@ get_avail() { fi if [ "$imagename" != "${prefix}-image-${kervers}" ]; then - if dpkg --compare-versions "$imagename" lt "${prefix}-image-${kervers}"; then + if dpkg --compare-versions 1."$imagename" lt 1."${prefix}-image-${kervers}"; then return 2 fi echo "$imagename" != "${prefix}-image-${kervers}" @@ -147,7 +147,7 @@ get_image_linux() { off=`get_offset "$image" $LZHDR` [ "$?" != "0" ] && off="-1" if [ "$off" -ne "-1" ]; then - (dd ibs="$[off-1]" skip=1 count=0 && dd bs=512k) < "$image" 2>/dev/null | lzcat 2>/dev/null + (dd ibs="$[off-1]" skip=1 count=0 && dd bs=512k) < "$image" 2>/dev/null | xzcat 2>/dev/null return fi