dsa-check-running-kernel: Try to fix zcat kernel case
authorPeter Palfrader <peter@palfrader.org>
Tue, 16 Apr 2013 10:10:38 +0000 (12:10 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 16 Apr 2013 10:10:38 +0000 (12:10 +0200)
dsa-nagios-checks/checks/dsa-check-running-kernel
dsa-nagios-checks/debian/changelog

index 1157480..ccdfd80 100755 (executable)
@@ -130,12 +130,17 @@ cat_vmlinux() {
        hdroff="$4"
 
        off=`get_offset "$image" $header`
-       if [ "$?" != 0 ]; then
+       local ret="$?"
+       if [ "$ret" != 0 ]; then
                # not found, exit
                return 1
        fi
 
-       (dd ibs="$((off+$hdroff))" skip=1 count=0 && dd bs=512k) < "$image"  2>/dev/null | $filter 2>/dev/null
+       (if [ "$off" != 0 ]; then
+          dd ibs="$((off+hdroff))" skip=1 count=0
+        fi &&
+        dd bs=512k) < "$image"  2>/dev/null | $filter 2>/dev/null
+       return 0
 }
 
 get_image_linux() {
index 721f1a5..cc04d15 100644 (file)
@@ -1,6 +1,6 @@
 dsa-nagios-checks (95) UNRELEASED; urgency=low
 
-  * 
+  * dsa-check-running-kernel: Try to fix zcat kernel case.
 
  -- Peter Palfrader <weasel@debian.org>  Tue, 16 Apr 2013 11:33:59 +0200