From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 16 Apr 2013 10:10:38 +0000 (+0200)
Subject: dsa-check-running-kernel: Try to fix zcat kernel case
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=a1bdffdd59f66e9687f8b5dc0582dbcd856a37bb;p=mirror%2Fdsa-nagios.git

dsa-check-running-kernel: Try to fix zcat kernel case
---

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index 1157480..ccdfd80 100755
--- a/dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/dsa-nagios-checks/checks/dsa-check-running-kernel
@@ -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() {
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 721f1a5..cc04d15 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -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