diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | nagios-plugins/check_kernel_status | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index cd5395a..8b57cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ sitesummary (0.1.11) UNRELEASED; urgency=low * Add Alexander Alemayhu as uploader. * Adjust nagios-plugins/check_kernel_status to avoid perl warning on Debian and Ubuntu. + * Reorder version matching in nagios-plugins/check_kernel_status to + handle newer Linux kernels in Debian (Closes: #752374). -- Petter Reinholdtsen <pere@debian.org> Thu, 21 Aug 2014 10:21:24 +0200 diff --git a/nagios-plugins/check_kernel_status b/nagios-plugins/check_kernel_status index cd2547e..102b428 100755 --- a/nagios-plugins/check_kernel_status +++ b/nagios-plugins/check_kernel_status @@ -37,14 +37,16 @@ elsif ( -e '/proc/version' ) { # Likely Debian $sig = `cat /proc/version`; - if ( $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)\.dfsg\.(\d+)-(\d+)\)/ + if ( + # 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+)\.dfsg\.(\d+)-(\d+)\)/ || $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)\.dfsg\.(\d+)-(\d+)\w+(\d+)\)/ || $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)-(\d+).+?(\d+).+?(\d+)\)/ || $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)-(\d+)lenny(\d+)\)/ - # New format in kernel package version 3.2.32-1 - || $sig =~ / Debian (\d+)\.(\d+)\.(\d+)-(\d+)/ - ) { @running_version = ($1, $2, $3, $4, $5 || 0, $6 || 0); |