about summary refs log tree commit diff
path: root/installer.sh.in
diff options
context:
space:
mode:
authorjbu <pullmoll@t-online.de>2015-05-14 17:51:25 +0200
committerjbu <pullmoll@t-online.de>2015-05-14 17:52:13 +0200
commit3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd (patch)
tree4bec804b3dcddb46b239aec5aff1124d55806d8a /installer.sh.in
parent0493378c0c2120979987b2ee64c5c5eb34a6fc7f (diff)
downloadhrmpf-3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd.tar.gz
hrmpf-3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd.tar.xz
hrmpf-3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd.zip
installer.sh.in: really fix the md parsing
Diffstat (limited to 'installer.sh.in')
-rw-r--r--installer.sh.in7
1 files 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