From 7e98b99846e1c74b25aeb8a509a28a1a9784f0a8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 24 May 2021 15:34:36 -0700 Subject: [PATCH] templates: Drop nomodeset / basic graphics menu from live configs nomodeset no long does anything helpful, and inst.text doesn't make sense with a live image so drop the menu from the live image. Related: rhbz#1961092 --- .../99-generic/live/config_files/aarch64/grub2-efi.cfg | 6 ------ .../99-generic/live/config_files/x86/grub2-efi.cfg | 6 ------ .../99-generic/live/config_files/x86/isolinux.cfg | 10 ---------- 3 files changed, 22 deletions(-) diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg index d0799243..ea655ff8 100644 --- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg @@ -34,9 +34,3 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet initrd @INITRDPATH@ } -submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet - initrd @INITRDPATH@ - } -} diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg index 2e24b15f..89a74ea5 100644 --- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg @@ -28,9 +28,3 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class g linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet initrdefi @INITRDPATH@ } -submenu 'Troubleshooting -->' { - menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet - initrdefi @INITRDPATH@ - } -} diff --git a/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg b/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg index bc36bb9c..324008a2 100644 --- a/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg +++ b/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg @@ -75,16 +75,6 @@ menu separator # insert an empty line menu begin ^Troubleshooting menu title Troubleshooting -label vesa - menu indent count 5 - menu label Start @PRODUCT@ @VERSION@ in ^basic graphics mode - text help - Try this option out if you're having trouble starting - @PRODUCT@ @VERSION@. - endtext - kernel vmlinuz - append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image nomodeset quiet - label memtest menu label Run a ^memory test text help