|
[-]
[+]
|
Added |
nagios-plugins-cciss.changes
|
|
|
|
[-]
[+]
|
Changed |
nagios-plugins-cciss.spec
^
|
|
|
|
[-]
[+]
|
Changed |
check_cciss
^
|
| @@ -4,7 +4,7 @@
# ( With HP Array Configuration Utility CLI hpacucli-x.y.*.rpm )
#
# Written by Simone Rosa (info@simonerosa.it)
-# Extende by Carsten Schoene (cs@linux-administrator.com)
+# Extended by Carsten Schoene (cs@linux-administrator.com)
#
# Description:
#
@@ -55,6 +55,9 @@
#
# ChangeLog:
#
+# 07/10/11 (1.12)
+# - Added support for newer kernels with hpsa driver
+#
# 19/08/11 (1.11)
# - Added support to disable chache check (-c)
#
@@ -105,6 +108,7 @@
NO_CACHE="0"
HPPROC="/proc/driver/cciss/cciss"
COMPAQPROC="/proc/driver/cpqarray/ida"
+HPSASYS="/sys/bus/pci/drivers/hpsa"
hpacucli="/usr/sbin/hpacucli"
. $PROGPATH/utils.sh
@@ -172,8 +176,12 @@
echo ${raid}
fi
if test ${status} -eq 1; then
- raid=`cat $COMPAQPROC* 2>&1`
- status=$?
+ if [ -n "` ls -1A $COMPAQPROC* 2>/dev/null`" ] ; then
+ raid=`cat $COMPAQPROC* 2>&1`
+ status=$?
+ elif [ -d "$HPSASYS" ] ; then
+ status=0
+ fi
if [ "$DEBUG" = "1" ]; then
echo ${raid}
fi
|
