diff --git a/install-dsmon.sh b/install-dsmon.sh index dd91332..9e3dc9c 100755 --- a/install-dsmon.sh +++ b/install-dsmon.sh @@ -33,7 +33,7 @@ fi echo -e "declare -A THRESHOLD" > /opt/idssys/dsmon/config.settings.inc echo "" -DRIVEINFO=`df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev' | awk '{ print $1 " " $2 " " $4 }' | sed 's/M//g'` +DRIVEINFO=`df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev' | awk '{ print $1 " " $2 " " $4 }'` DRIVEINFO=(${DRIVEINFO}) NUMDRIVES=$((${#DRIVEINFO[@]} / 3)) @@ -41,18 +41,18 @@ NUMDRIVES=$((${#DRIVEINFO[@]} / 3)) for ((i = 0 ; i <= $((${NUMDRIVES}-1)) ; i++)); do ii=$((${i}*3)) ia=${DRIVEINFO[${ii}]} - ib=$(bc <<< "scale=2; ${DRIVEINFO[$((${ii}+1))]}/1024") - ic=$(bc <<< "scale=2; ${DRIVEINFO[$((${ii}+2))]}/1024") + ib=$(bc <<< "scale=2; ${DRIVEINFO[$((${ii}+1))]//M/}/1024") + ic=$(bc <<< "scale=2; ${DRIVEINFO[$((${ii}+2))]//M/}/1024") ia=${ia//\/dev\/mapper\//} ia=${ia//\/dev\//} - if [ "${ia}" = "sda1" ] && [ ${DRIVEINFO[$((${ii}+1))]} -lt 1024 ]; then + if [ "${ia}" = "sda1" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then systempartition=true - elif [ "${ia}" = "sda2" ] && [ ${DRIVEINFO[$((${ii}+1))]} -lt 1024 ]; then + elif [ "${ia}" = "sda2" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then systempartition=true - elif [ "${ia}" = "nvme0n1p1" ] && [ ${DRIVEINFO[$((${ii}+1))]} -lt 1024 ]; then + elif [ "${ia}" = "nvme0n1p1" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then systempartition=true - elif [ "${ia}" = "mmcblk0p1" ] && [ ${DRIVEINFO[$((${ii}+1))]} -lt 1024 ]; then + elif [ "${ia}" = "mmcblk0p1" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then systempartition=true elif [ "${ia}" != "overlay" ]; then #echo "${ia};${ib};${ic}"