manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
8c65231ad1), but for BIOS as well.
This commit is contained in:
Roland Clobus 2022-06-01 09:12:01 +02:00
parent 8c65231ad1
commit 17cb77ab82
No known key found for this signature in database
GPG Key ID: 62C57C6AA61495BD
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/configuration.sh
View File

@ -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

8
scripts/build/binary_grub_cfg
View File

@ -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