Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rhel10 revert nomodeset #1433

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Rhel10 revert nomodeset #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de434c
Revert "templates: Drop nomodeset / basic graphics menu from live con…
bcl Nov 12, 2024
1d91688
Revert "templates: Change nomodeset / basic graphics to use inst.text"
bcl Nov 12, 2024
fb1eed0
Revert "tests: Swap nomodeset for inst.text in mkksiso test data"
bcl Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions share/templates.d/99-generic/config_files/x86/grub2-bios.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions share/templates.d/99-generic/config_files/x86/grub2-efi.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions share/templates.d/99-generic/config_files/x86/isolinux.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
}
}
4 changes: 4 additions & 0 deletions share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 6 additions & 0 deletions share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
}
}
4 changes: 2 additions & 2 deletions tests/mkksiso/data/BOOT.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/BOOT.conf.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/bios-grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/bios-grub.cfg.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/efi-grub.cfg.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tests/mkksiso/data/isolinux.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/mkksiso/data/isolinux.cfg.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/uefi-grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/mkksiso/data/uefi-grub.cfg.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down