packages: nagios-plugin-check_raid/check_raid - cciss: match only "c*d0" no...

[glen]

Author: glen                         Date: Wed Apr 11 13:56:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cciss: match only "c*d0" not to report same controller twice if more than one disk defined

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.117 -> 1.118) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.117 packages/nagios-plugin-check_raid/check_raid:1.118
--- packages/nagios-plugin-check_raid/check_raid:1.117	Wed Apr 11 15:52:01 2012
+++ packages/nagios-plugin-check_raid/check_raid	Wed Apr 11 15:56:32 2012
@@ -1056,7 +1056,8 @@
 		foreach my $f (</proc/driver/cciss/*>) {
 			open my $fh, '<', $f or next;
 			while (<$fh>) {
-				next unless (my($dev) = m{^(cciss/[^:]+):});
+				# check "c*d0" - iterate over each controller
+				next unless (my($dev) = m{^(cciss/c\d+d0):});
 				$dev = "/dev/$dev";
 				# filter via valid() so could exclude devs
 				push(@devs, $dev) if valid($dev);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_raid/check_raid?r1=1.117&r2=1.118