From 3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd Mon Sep 17 00:00:00 2001 From: jbu Date: Thu, 14 May 2015 17:51:25 +0200 Subject: installer.sh.in: really fix the md parsing --- installer.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/installer.sh.in b/installer.sh.in index aac3bee..70700b5 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -166,11 +166,12 @@ show_partitions() { done # Software raid (md) for p in $(ls -d /dev/md* 2>/dev/null|grep '[0-9]'); do - if cat /proc/mdstat|grep -qw $(echo $p|sed -e 's|/dev/||g'); then - fstype=$(lsblk -nfr /dev/$p|awk '{print $2}') + part=$(basename $p) + if cat /proc/mdstat|grep -qw $part; then + fstype=$(lsblk -nfr /dev/$part|awk '{print $2}') [ "$fstype" = "crypto_LUKS" ] && continue [ "$fstype" = "LVM2_member" ] && continue - fssize=$(lsblk -nr /dev/$p|awk '{print $4}') + fssize=$(lsblk -nr /dev/$part|awk '{print $4}') echo "$p" echo "size:${fssize:-unknown};fstype:${fstype:-none}" fi -- cgit 1.4.1