summaryrefslogtreecommitdiffstats
path: root/source/installer
diff options
context:
space:
mode:
Diffstat (limited to 'source/installer')
-rw-r--r--source/installer/ChangeLog.txt4
-rwxr-xr-xsource/installer/sources/initrd/usr/lib/setup/SeTEFI2
2 files changed, 5 insertions, 1 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 25dec14bb..56a049e16 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Mon Dec 30 20:05:46 UTC 2019
+ SeTEFI: Patched to remove extra whitespace from lsblk output.
+ Thanks to Didier Spaier.
++--------------------------+
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
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTEFI b/source/installer/sources/initrd/usr/lib/setup/SeTEFI
index bb00d1e52..fdf545849 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTEFI
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTEFI
@@ -24,7 +24,7 @@ ESPGUID=C12A7328-F81F-11D2-BA4B-00A0C93EC93B
OSTYPE=0xEF
lsblk -l -o parttype,name | \
grep -i -F -e "$ESPGUID" -e "$OSTYPE" | \
-sed "s,[^ ]* ,/dev/," > $TMP/SeTefipartitions
+sed "s,[^ ]*[ ]*,/dev/," > $TMP/SeTefipartitions
if [ ! -s $TMP/SeTefipartitions ]; then # No EFI partitions
rm -f $TMP/SeTefipartitions