diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/installer/ChangeLog.txt | 5 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/sbin/probe | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index db57f3efc..25dec14bb 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat Dec 7 02:24:58 UTC 2019 + sources/initrd/skeleton_initrd.tar.gz: + /sbin/probe: adjust to newer "cryptsetup status" output. This fixes all LVM + volumes being listed twice. ++--------------------------+ Fri Dec 6 20:16:45 UTC 2019 repack_installer.SlackBuild: Added. This repacks the installer from the tree found under diff --git a/source/installer/sources/initrd/sbin/probe b/source/installer/sources/initrd/sbin/probe index eca6db9dd..f7ab07ab8 100755 --- a/source/installer/sources/initrd/sbin/probe +++ b/source/installer/sources/initrd/sbin/probe @@ -186,10 +186,10 @@ list_lvm() { # List any volumes created by cryptsetup list_crypt() { - for i in $(ls /dev/mapper/); do - if cryptsetup status $i 2>/dev/null | grep "is active" 1>/dev/null ; then - DEV=$(cryptsetup status $i 2>/dev/null | grep "is active" | cut -f1 -d' ') - SIZE=$(fdisk -s $(cryptsetup status $i 2>/dev/null | grep "device:" | cut -f2 -d: | tr -d ' ')) + for i in $(/bin/ls /dev/mapper/); do + if cryptsetup status $i 2>/dev/null | grep -wq "cipher:" ; then + DEV=$(cryptsetup status $i | head -n 1 | cut -f 1 -d ' ') + SIZE=$(fdisk -s $(cryptsetup status $i | grep "device:" | cut -f 2 -d : | tr -d ' ')) echo "$DEV 0 0 $SIZE lc Linux" >> $TMP/SeTfdisk fi done |