From 2de434c92e73969f7e146ff3c33efbc0fba50508 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 12 Nov 2024 10:51:22 -0800 Subject: [PATCH 1/3] Revert "templates: Drop nomodeset / basic graphics menu from live configs" This reverts commit 321542f7bbb3b08141019c2c10ec588419d89a17. After discussing this it ends up that nomodeset causes it to fall back to simpledrm which can be useful in some cases. --- .../99-generic/live/config_files/aarch64/grub2-efi.cfg | 6 ++++++ .../99-generic/live/config_files/x86/grub2-bios.cfg | 4 ++++ .../99-generic/live/config_files/x86/grub2-efi.cfg | 6 ++++++ 3 files changed, 16 insertions(+) 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 ece548aa0..c874547f0 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,3 +34,9 @@ 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 rhgb + initrd @INITRDPATH@ + } +} diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg index 013877544..73d0a56e8 100644 --- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg +++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg @@ -26,6 +26,10 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class g initrd @INITRDPATH@ } submenu 'Troubleshooting -->' { + menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset vga=791 quiet rhgb + initrd @INITRDPATH@ + } menuentry 'Boot first drive' --class fedora --class gnu-linux --class gnu --class os { chainloader (hd0)+1 } 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 31083c5a5..390695856 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,3 +28,9 @@ 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 rhgb + initrdefi @INITRDPATH@ + } +} From 1d91688472cf0c3540391b66aa9574eccf1cf67a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 12 Nov 2024 10:52:04 -0800 Subject: [PATCH 2/3] Revert "templates: Change nomodeset / basic graphics to use inst.text" This reverts commit a01a0910afdc6c92225976aba6ec72d795829e7b. After discussing this it ends up that nomodeset causes it to fall back to simpledrm which can be useful in some cases. --- .../99-generic/config_files/aarch64/grub2-efi.cfg | 4 ++-- .../templates.d/99-generic/config_files/x86/grub2-bios.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 +++--- 4 files changed, 9 insertions(+), 9 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 80db480ae..1ce5d33a9 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 text mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ inst.text + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ nomodeset 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-bios.cfg b/share/templates.d/99-generic/config_files/x86/grub2-bios.cfg index 4e894ac6f..cfca1bf68 100644 --- a/share/templates.d/99-generic/config_files/x86/grub2-bios.cfg +++ b/share/templates.d/99-generic/config_files/x86/grub2-bios.cfg @@ -26,8 +26,8 @@ menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class initrd @INITRDPATH@ } submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class fedora --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ inst.text quiet + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ nomodeset quiet initrd @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/grub2-efi.cfg b/share/templates.d/99-generic/config_files/x86/grub2-efi.cfg index 5fc47ded6..8c9adadd9 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 text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ inst.text quiet + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ nomodeset 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 0aad2b926..216d36f29 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 text +label basic menu indent count 5 - menu label Install @PRODUCT@ @VERSION@ using ^text mode + menu label Install using ^basic graphics mode text help Try this option out if you're having trouble installing @PRODUCT@ @VERSION@. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ inst.text quiet + append initrd=initrd.img @ROOT@ nomodeset quiet label rescue menu indent count 5 From fb1eed0516773ec5ad1ff9537b307960e7022869 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 12 Nov 2024 10:52:16 -0800 Subject: [PATCH 3/3] Revert "tests: Swap nomodeset for inst.text in mkksiso test data" This reverts commit c8470ce1307b9fa7c4d34e7925dc70f76fce2b96. --- tests/mkksiso/data/BOOT.conf | 4 ++-- tests/mkksiso/data/BOOT.conf.result | 4 ++-- tests/mkksiso/data/bios-grub.cfg | 4 ++-- tests/mkksiso/data/bios-grub.cfg.result | 4 ++-- tests/mkksiso/data/efi-grub.cfg.result | 4 ++-- tests/mkksiso/data/isolinux.cfg | 6 +++--- tests/mkksiso/data/isolinux.cfg.result | 6 +++--- tests/mkksiso/data/uefi-grub.cfg | 4 ++-- tests/mkksiso/data/uefi-grub.cfg.result | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/mkksiso/data/BOOT.conf b/tests/mkksiso/data/BOOT.conf index 4cb7ad96a..93b17d94e 100644 --- a/tests/mkksiso/data/BOOT.conf +++ b/tests/mkksiso/data/BOOT.conf @@ -29,8 +29,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test inst.text quiet + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test nomodeset quiet initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/BOOT.conf.result b/tests/mkksiso/data/BOOT.conf.result index 21b9bfa02..d70326d96 100644 --- a/tests/mkksiso/data/BOOT.conf.result +++ b/tests/mkksiso/data/BOOT.conf.result @@ -29,8 +29,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test inst.text inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test nomodeset inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/bios-grub.cfg b/tests/mkksiso/data/bios-grub.cfg index cb59a15e7..84aa48e01 100644 --- a/tests/mkksiso/data/bios-grub.cfg +++ b/tests/mkksiso/data/bios-grub.cfg @@ -25,8 +25,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrd /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test inst.text quiet + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test nomodeset quiet initrd /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/bios-grub.cfg.result b/tests/mkksiso/data/bios-grub.cfg.result index b27c60923..cf5c2de6e 100644 --- a/tests/mkksiso/data/bios-grub.cfg.result +++ b/tests/mkksiso/data/bios-grub.cfg.result @@ -25,8 +25,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrd /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test inst.text inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test nomodeset inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 initrd /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/efi-grub.cfg.result b/tests/mkksiso/data/efi-grub.cfg.result index 21b9bfa02..d70326d96 100644 --- a/tests/mkksiso/data/efi-grub.cfg.result +++ b/tests/mkksiso/data/efi-grub.cfg.result @@ -29,8 +29,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test inst.text inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test nomodeset inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/isolinux.cfg b/tests/mkksiso/data/isolinux.cfg index 7766ffcab..1660c4e76 100644 --- a/tests/mkksiso/data/isolinux.cfg +++ b/tests/mkksiso/data/isolinux.cfg @@ -75,15 +75,15 @@ menu separator # insert an empty line menu begin ^Troubleshooting menu title Troubleshooting Fedora rawhide -label text +label basic menu indent count 5 - menu label Install using ^text mode + menu label Install using ^basic graphics mode text help Try this option out if you're having trouble installing Fedora rawhide. endtext kernel vmlinuz - append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-rawhide-test inst.text quiet + append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-rawhide-test nomodeset quiet label rescue menu indent count 5 diff --git a/tests/mkksiso/data/isolinux.cfg.result b/tests/mkksiso/data/isolinux.cfg.result index 4ccc7657e..928b2d38f 100644 --- a/tests/mkksiso/data/isolinux.cfg.result +++ b/tests/mkksiso/data/isolinux.cfg.result @@ -75,15 +75,15 @@ menu separator # insert an empty line menu begin ^Troubleshooting menu title Troubleshooting Fedora rawhide -label text +label basic menu indent count 5 - menu label Install using ^text mode + menu label Install using ^basic graphics mode text help Try this option out if you're having trouble installing Fedora rawhide. endtext kernel vmlinuz - append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test inst.text inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 + append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test nomodeset inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 label rescue menu indent count 5 diff --git a/tests/mkksiso/data/uefi-grub.cfg b/tests/mkksiso/data/uefi-grub.cfg index 4cb7ad96a..93b17d94e 100644 --- a/tests/mkksiso/data/uefi-grub.cfg +++ b/tests/mkksiso/data/uefi-grub.cfg @@ -29,8 +29,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test inst.text quiet + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-rawhide-test nomodeset quiet initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os { diff --git a/tests/mkksiso/data/uefi-grub.cfg.result b/tests/mkksiso/data/uefi-grub.cfg.result index 21b9bfa02..d70326d96 100644 --- a/tests/mkksiso/data/uefi-grub.cfg.result +++ b/tests/mkksiso/data/uefi-grub.cfg.result @@ -29,8 +29,8 @@ menuentry 'Test this media & install Fedora rawhide' --class fedora --class gnu- initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Fedora rawhide in text mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test inst.text inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 + menuentry 'Install Fedora rawhide in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-mkksiso-rawhide-test nomodeset inst.ks=file:///installer.ks quoted="A longer string with spaces that is quoted should not be split" console=ttyS0,115200n8 console=tty1 initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os {