diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-07 21:42:59 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-12-08 08:59:52 +0100 |
| commit | b2e4f133eb4a93db0a557c6cbb4367e88083ce09 (patch) | |
| tree | f7fe9ed2d22bbf6a38632a4e7793ca5ab64a24bd /source/installer | |
| parent | 47964291693dfba44143431da5eefd00717e005b (diff) | |
| download | current-b2e4f133eb4a93db0a557c6cbb4367e88083ce09.tar.gz | |
Sat Dec 7 21:42:59 UTC 201920191207214259
l/imagemagick-7.0.9_8-x86_64-1.txz: Upgraded.
n/gnupg2-2.2.19-x86_64-1.txz: Upgraded.
n/mobile-broadband-provider-info-20190822-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/installer')
| -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 db57f3ef..25dec14b 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 eca6db9d..f7ab07ab 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 |