packages: nagios-plugin-check_raid/check_raid - allow ignoring checks if /p...

[glen]

Author: glen                         Date: Wed Apr 14 12:53:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow ignoring checks if /proc is found but not wanted

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.79 packages/nagios-plugin-check_raid/check_raid:1.80
--- packages/nagios-plugin-check_raid/check_raid:1.79	Wed Apr 14 14:41:31 2010
+++ packages/nagios-plugin-check_raid/check_raid	Wed Apr 14 14:53:52 2010
@@ -1171,13 +1171,13 @@
 $status = $ERRORS{OK};
 $message = '';
 
-check_gdth if -d "/proc/scsi/gdth";
-check_megaide if -d "/proc/megaide";
-check_mdstat if -f "/proc/mdstat";
-check_mpt if -d "/proc/mpt";
-check_dpt_i2o if -d "/proc/scsi/dpt_i2o";
-check_megaraid if -d "/proc/megaraid";
-check_aaccli if -d "/proc/scsi/aacraid";
+check_gdth if -d "/proc/scsi/gdth" and valid("/proc/scsi/gdth");
+check_megaide if -d "/proc/megaide" and valid("/proc/megaide");
+check_mdstat if -f "/proc/mdstat" and valid("/proc/mdstat");
+check_mpt if -d "/proc/mpt" and valid("/proc/mpt");
+check_dpt_i2o if -d "/proc/scsi/dpt_i2o" and valid("/proc/scsi/dpt_i2o");
+check_megaraid if -d "/proc/megaraid" and valid("/proc/megaraidc");
+check_aaccli if -d "/proc/scsi/aacraid" and valid("/proc/scsi/aacraid");
 check_afacli if $afacli;
 check_lsraid if $lsraid;
 check_megacli if $megacli;
@@ -1188,7 +1188,7 @@
 check_arcconf if $arcconf;
 check_megarc if $megarc;
 check_cmdtool2 if $cmdtool2;
-check_cciss if -d "/proc/driver/cciss";
+check_cciss if -d "/proc/driver/cciss" and valid("/proc/driver/cciss");
 check_hp_msa if sys_have_msa;
 
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid?r1=1.79&r2=1.80&f=u