[debian-edu-commits] debian-edu/upstream/ 01/01: Adjust nagios kernel version checking module to work with recent Ubuntu kernels (Closes: #803720). Patch from Daniele Palumbo.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository sitesummary.

commit 92b6864c584c71dcb3e95cdfc796e21c1ff9731a
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon May 16 09:12:42 2016 +0200

    Adjust nagios kernel version checking module to work with recent Ubuntu kernels (Closes: #803720).  Patch from Daniele Palumbo.
---
 debian/changelog                   | 2 ++
 nagios-plugins/check_kernel_status | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0825ea3..8218165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ sitesummary (0.1.21) UNRELEASED; urgency=medium
   [ Petter Reinholdtsen ]
   * Add Brazilian Portuguese (pt_BR) translation by Adriano Rafael Gomes
     (Closes: #816940).
+  * Adjust nagios kernel version checking module to work with recent
+    Ubuntu kernels (Closes: #803720).  Patch from Daniele Palumbo.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 15 May 2016 10:30:13 +0200
 
diff --git a/nagios-plugins/check_kernel_status b/nagios-plugins/check_kernel_status
index 102b428..742f90c 100755
--- a/nagios-plugins/check_kernel_status
+++ b/nagios-plugins/check_kernel_status
@@ -41,6 +41,7 @@ elsif ( -e '/proc/version' )
              # New format in kernel package version 3.2.32-1, match first to also work with
              # kernel 3.13 and later in Debian.
              $sig =~ / Debian (\d+)\.(\d+)\.(\d+)-(\d+)/
+	     || $sig =~ / Debian (\d+)\.(\d+)\.(\d+)-ckt(\d+)-(\d+)/
 
              || $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)\.dfsg\.(\d+)-(\d+)\)/
 	     || $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)\.dfsg\.(\d+)-(\d+)\w+(\d+)\)/
@@ -110,6 +111,10 @@ elsif ( $dpkg =~ / (\d+)\.(\d+)\.(\d+)-(\d+)/ )
 	# Debian Lenny
 	@installed_version = ($1, $2, $3, $4, 0, 0);
 }
+elsif( $dpkg =~ / (\d+)\.(\d+)\.(\d+)-ckt(\d+)-(\d+)/ )
+{
+	@installed_version = ($1, $2, $3, $4, $5, 0);
+}
 else
 {
 	print "UNKNOWN - Could not determine installed version ($dpkg).\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/sitesummary.git