packages: nagios-plugin-check_raid/check_raid - cciss: allow excluding devs...

[glen]

Author: glen                         Date: Wed Apr 11 13:52:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cciss: allow excluding devs via ignore parameter

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

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.116 packages/nagios-plugin-check_raid/check_raid:1.117
--- packages/nagios-plugin-check_raid/check_raid:1.116	Sat Apr  7 17:44:12 2012
+++ packages/nagios-plugin-check_raid/check_raid	Wed Apr 11 15:52:01 2012
@@ -1056,8 +1056,10 @@
 		foreach my $f (</proc/driver/cciss/*>) {
 			open my $fh, '<', $f or next;
 			while (<$fh>) {
-				next unless (my($s) = m{^(cciss/[^:]+):});
-				push(@devs, "/dev/$s");
+				next unless (my($dev) = m{^(cciss/[^:]+):});
+				$dev = "/dev/$dev";
+				# filter via valid() so could exclude devs
+				push(@devs, $dev) if valid($dev);
 			}
 			close $fh;
 		}
================================================================

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