From bcd3a6573e886688c93caac16f3e1302cdfd37b4 Mon Sep 17 00:00:00 2001 From: SourceDoctor Date: Sun, 30 Jun 2019 22:50:29 +0200 Subject: [PATCH] mdadm name independent mdadm array detection --- snmp/mdadm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/snmp/mdadm b/snmp/mdadm index f6340d4..ed291bc 100755 --- a/snmp/mdadm +++ b/snmp/mdadm @@ -2,6 +2,8 @@ CAT=/bin/cat LS=/bin/ls +BASENAME=/usr/bin/basename +REALPATH=/usr/bin/realpath CONFIGFILE=/etc/snmp/mdadm.conf if [ -f $CONFIGFILE ] ; then @@ -15,7 +17,8 @@ ERROR_STRING="" OUTPUT_DATA='['\ if [ -d /dev/md ] ; then - for RAID in /sys/block/md* ; do + for ARRAY_BLOCKDEVICE in $(ls -1 /dev/md/*) ; do + RAID="/sys/block/"$($BASENAME $($REALPATH $ARRAY_BLOCKDEVICE)) # ignore arrays with no slaves if [ -z "$($LS -1 $RAID/slaves)" ] ; then @@ -26,7 +29,11 @@ if [ -d /dev/md ] ; then continue fi - RAID_NAME=$(basename $RAID) + if [[ $($BASENAME $ARRAY_BLOCKDEVICE) = [[:digit:]] ]]; then + RAID_NAME=$($BASENAME $RAID) + else + RAID_NAME=$($BASENAME $ARRAY_BLOCKDEVICE) + fi RAID_DEV_LIST=$($LS $RAID/slaves/) RAID_LEVEL=$($CAT $RAID/md/level) RAID_DISC_COUNT=$($CAT $RAID/md/raid_disks)