--- installer-current-old/usr/lib/setup/SeTEFI	2019-12-30 21:05:21.000000000 +0100
+++ installer-proposed/usr/lib/setup/SeTEFI	2020-09-10 23:03:07.552636328 +0200
@@ -35,11 +35,94 @@
 # will probably be on /dev/sda:
 PREFERRED_EFI_PARTITION="$(cat $TMP/SeTefipartitions | head -n 1)"
 
+# the next part taken from /usr/share/mkinitrd/mkinitrd-command-generator.sh
+# Original copyright and license:
+# $Id: mkinitrd_command_generator.sh,v 1.45 2011/02/17 09:27:05 eha Exp eha $
+# Copyright 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Eric Hameleers, Eindhoven, Netherlands
+#                                   Contact: <alien@slackware.com>
+# Copyright 2008, 2009  PiterPUNK, Sao Paulo, SP, Brazil
+#                       Contact: <piterpunk@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+
+if $( lvdisplay -c $ROOTDEV 1>/dev/null 2>/dev/null ); then
+  # Our root partition is on a LV:
+  # Search the Physical Volume of our Logical Volume:
+  MYVG=$( echo $(lvdisplay -c $ROOTDEV 2>/dev/null) | cut -d: -f2 )
+  for LINE in $(pvdisplay -c) ; do
+    VG=$(echo $LINE | cut -d: -f2)
+    [ "$VG" = "$MYVG" ] && break
+  done 
+  PV=$(echo $LINE | cut -d: -f1)
+  # Check if there is a LUKS device underneath:
+  if $( cryptsetup status $PV 1>/dev/null 2>/dev/null ) ; then
+    # Our root partition's LV  is on a LUKS volume:
+    REALDEV=$( cryptsetup status $PV | grep 'device: ' | tr -d ' ' | cut -d: -f2 )
+    BASEDEV=$REALDEV
+  else
+    BASEDEV=$PV
+  fi
+elif $( cryptsetup status $ROOTDEV 1>/dev/null 2>/dev/null ) ; then
+  # Our root device is on a LUKS volume:
+  REALDEV=$( cryptsetup status $ROOTDEV | grep 'device: ' | tr -d ' ' | cut -d: -f2 )
+  ROOTDEV=$(basename $ROOTDEV)
+  # Check for LVM:
+  for LV in $(lvdisplay -c 2>/dev/null | tr -d ' ' | cut -f1 -d:) ; do
+    # Note: cryptsetup shows the real device, whereas 
+    # lvdisplay requires the /dev/<myvg>/... symlink to the real device.
+    if [ "$(readlink $LV)" = "$REALDEV" ]; then
+      REALDEV=$LV
+      break
+    fi
+  done
+  if $( lvdisplay -c $REALDEV 1>/dev/null 2>/dev/null ); then
+    # Our root partition's LUKS device is on a LV:
+    # Search the Physical Volume of our Logical Volume:
+    MYVG=$( echo $(lvdisplay -c $REALDEV 2>/dev/null) | cut -d: -f2 )
+    for LINE in $(pvdisplay -c) ; do
+      VG=$(echo $LINE | cut -d: -f2)
+      [ "$VG" = "$MYVG" ] && break
+    done 
+    PV=$(echo $LINE | cut -d: -f1)
+    BASEDEV=$PV
+  else
+    BASEDEV=$REALDEV
+  fi
+else
+  BASEDEV=$ROOTDEV
+fi
+
+# On traditional SATA and IDE drives take the first 8 chars, to catch
+# newer NVME drives take 12 chars
+if test $(echo $BASEDEV | grep nvme); then
+  MAXCOMPARE=12
+else
+  MAXCOMPARE=8
+fi
+
 # But we will also test to see if there is an EFI partition on the same
 # device as the root partition, and if so, prefer that:
 if [ -r $TMP/SeTrootdev ]; then
-  if grep -q "$(cat $TMP/SeTrootdev | cut -b 1-8)" $TMP/SeTefipartitions ; then
-    PREFERRED_EFI_PARTITION="$(grep "$(cat $TMP/SeTrootdev | cut -b 1-8)" $TMP/SeTefipartitions | head -n 1)"
+  if grep -q "$(echo $BASEDEV | cut -b 1-$MAXCOMPARE)" $TMP/SeTefipartitions ; then
+    PREFERRED_EFI_PARTITION="$(grep "$(echo $BASEDEV | cut -b 1-$MAXCOMPARE)" $TMP/SeTefipartitions | head -n 1)"
   fi
 fi