From 17cb77ab82075a7577ef518d14cb09627499d955 Mon Sep 17 00:00:00 2001
From: Roland Clobus <rclobus@rclobus.nl>
Date: Wed, 1 Jun 2022 09:12:01 +0200
Subject: [PATCH] Removes 'nomodeset' from fail-safe boot.

After more tests on openQA, it was shown that 'nomodeset' not only for
UEFI makes the image non-bootable (see
8c65231ad1b7bb71ffbc5d2d75ad8d7d420501b4), but for BIOS as well.
---
 functions/configuration.sh    | 4 ++--
 scripts/build/binary_grub_cfg | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/functions/configuration.sh b/functions/configuration.sh
index e956d0a41..6aa45c35c 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -389,12 +389,12 @@ Prepare_config ()
 	case "${LB_INITRAMFS}" in
 		live-boot)
 			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live components quiet splash}"
-			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788}"
+			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788}"
 			;;
 
 		none)
 			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}"
-			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788}"
+			LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788}"
 			;;
 	esac
 
diff --git a/scripts/build/binary_grub_cfg b/scripts/build/binary_grub_cfg
index c442ac12d..1ead2c7a7 100755
--- a/scripts/build/binary_grub_cfg
+++ b/scripts/build/binary_grub_cfg
@@ -164,18 +164,10 @@ else
 		"${APPEND_LIVE}" \
 		"l"
 	if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ]; then
-		echo "if [ \"\${grub_platform}\" = \"efi\" ]; then" >> "${LIVE_ENTRIES_TMP}"
-		# For EFI: remove 'nomodeset' from the kernel options
-		Grub_live_menu_entry "Live system (${_FLAVOUR} fail-safe mode)" \
-			"/${INITFS}/${DEFAULT_KERNEL}" \
-			"/${INITFS}/${DEFAULT_INITRD}" \
-			"$(echo "${LB_BOOTAPPEND_LIVE_FAILSAFE}" | sed -e 's/nomodeset //')"
-		echo "else" >> "${LIVE_ENTRIES_TMP}"
 		Grub_live_menu_entry "Live system (${_FLAVOUR} fail-safe mode)" \
 			"/${INITFS}/${DEFAULT_KERNEL}" \
 			"/${INITFS}/${DEFAULT_INITRD}" \
 			"${LB_BOOTAPPEND_LIVE_FAILSAFE}"
-		echo "fi" >> "${LIVE_ENTRIES_TMP}"
 	fi
 fi
 
-- 
GitLab