From 7ee4265066c7e9542207a02e0056618df365bd2e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 24 May 2021 15:35:47 -0700 Subject: [PATCH] templates: Change nomodeset / basic graphics to use inst.text nomodeset no longer does anything helpful, so switch to booting in text mode in the Troubleshooting menu. --- .../99-generic/config_files/aarch64/grub2-efi.cfg | 4 ++-- share/templates.d/99-generic/config_files/x86/grub2-efi.cfg | 4 ++-- share/templates.d/99-generic/config_files/x86/isolinux.cfg | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg index 1ce5d33a..80db480a 100644 --- a/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg +++ b/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg @@ -35,8 +35,8 @@ menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gn initrd @INITRDPATH@ } submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ nomodeset + menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class red --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ inst.text initrd @INITRDPATH@ } menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { diff --git a/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg index 8c9adadd..5fc47ded 100644 --- a/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg +++ b/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg @@ -29,8 +29,8 @@ menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class initrdefi @INITRDPATH@ } submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet + menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ inst.text quiet initrdefi @INITRDPATH@ } menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/share/templates.d/99-generic/config_files/x86/isolinux.cfg b/share/templates.d/99-generic/config_files/x86/isolinux.cfg index 80df94f5..a9977f45 100644 --- a/share/templates.d/99-generic/config_files/x86/isolinux.cfg +++ b/share/templates.d/99-generic/config_files/x86/isolinux.cfg @@ -75,15 +75,15 @@ menu separator # insert an empty line menu begin ^Troubleshooting menu title Troubleshooting @PRODUCT@ @VERSION@ -label basic +label text menu indent count 5 - menu label Install using ^basic graphics mode + menu label Install using ^text mode text help Try this option out if you're having trouble installing @PRODUCT@ @VERSION@. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ nomodeset quiet + append initrd=initrd.img @ROOT@ inst.text quiet label rescue menu indent count 5