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 1ce5d33a9..80db480ae 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-bios.cfg b/share/templates.d/99-generic/config_files/x86/grub2-bios.cfg index cfca1bf68..4e894ac6f 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 basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ nomodeset quiet + menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ inst.text 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 8c9adadd9..5fc47ded6 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 216d36f29..0aad2b926 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 @PRODUCT@ @VERSION@ 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 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 c874547f0..ece548aa0 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 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 73d0a56e8..013877544 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,10 +26,6 @@ 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 390695856..31083c5a5 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 rhgb - initrdefi @INITRDPATH@ - } -} diff --git a/tests/mkksiso/data/BOOT.conf b/tests/mkksiso/data/BOOT.conf index 93b17d94e..4cb7ad96a 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 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 + 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 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 d70326d96..21b9bfa02 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 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 + 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 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 84aa48e01..cb59a15e7 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 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 + 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 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 cf5c2de6e..b27c60923 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 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 + 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 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 d70326d96..21b9bfa02 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 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 + 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 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 1660c4e76..7766ffcab 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 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 Fedora rawhide. endtext kernel vmlinuz - append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-rawhide-test nomodeset quiet + append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-rawhide-test inst.text quiet label rescue menu indent count 5 diff --git a/tests/mkksiso/data/isolinux.cfg.result b/tests/mkksiso/data/isolinux.cfg.result index 928b2d38f..4ccc7657e 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 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 Fedora rawhide. endtext kernel vmlinuz - 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 + 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 label rescue menu indent count 5 diff --git a/tests/mkksiso/data/uefi-grub.cfg b/tests/mkksiso/data/uefi-grub.cfg index 93b17d94e..4cb7ad96a 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 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 + 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 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 d70326d96..21b9bfa02 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 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 + 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 initrdefi /images/pxeboot/initrd.img } menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os {