Merge branch 'ignore-efi' into 'main'

mkuserland.sh: use /etc/flash-kernel/ignore-efi since flash-kernel 3.107 to...

See merge request reform/reform-system-image!72

reform2-imx8mq/mkuserland.sh

@@ -28,6 +28,8 @@ mmdebstrap \
 	--essential-hook='echo "MNT Reform 2" > "$1"/etc/flash-kernel/machine' \
 	--essential-hook='{ echo /dev/mmcblk1p2 / auto errors=remount-ro 0 1; echo /dev/mmcblk1p1 /boot auto errors=remount-ro 0 1; } > "$1"/etc/fstab' \
 	--essential-hook='{ echo LINUX_KERNEL_CMDLINE=\"console=ttymxc0,115200 console=tty1\"; echo LINUX_KERNEL_CMDLINE_DEFAULTS=\"ro no_console_suspend cma=512M pci=nomsi\"; } > "$1"/etc/default/flash-kernel' \
+	${comment#create boot.scr even if host running this uses EFI} \
+	--essential-hook='echo yes > "$1"/etc/flash-kernel/ignore-efi' \
 	${comment#select timezone} \
 	--essential-hook='echo tzdata tzdata/Areas select Europe | chroot "$1" debconf-set-selections' \
 	--essential-hook='echo tzdata tzdata/Zones/Europe select Berlin | chroot "$1" debconf-set-selections' \
@@ -57,4 +59,6 @@ mmdebstrap \
 	--customize-hook='chroot "$1" sed -i "s/^root:[^:]\+:/root::/" /etc/shadow' \
 	--customize-hook='rm "$1"/etc/resolv.conf' \
 	--customize-hook='rm "$1"/var/lib/dbus/machine-id' ${comment#gets regenerated by dbus} \
+	${comment#smoke test to check if boot.scr exists despite EFI, see https://salsa.debian.org/installer-team/flash-kernel/-/merge_requests/33} \
+	--customize-hook='[ -e "$1"/boot/boot.scr ]' \
 	unstable target-userland.tar http://deb.debian.org/debian "deb [arch=arm64 trusted=yes] https://mntre.com/reform-debian-repo reform main"