diff --git a/functions/configuration.sh b/functions/configuration.sh index e956d0a41f32543816559e82bc6c12d849d87a43..6aa45c35c665aee57949abfd665090ddb4088a66 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 c442ac12dcc700687a44d4f81f098ced968b9e56..1ead2c7a7bf7c760f5f4ef94e69ab685c4d2c65e 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