tests: Swap nomodeset for inst.text in mkksiso test data

Related: RHEL-66603
weldr · Nov 8, 2024 · c8470ce · c8470ce
1 parent a01a091
commit c8470ce
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {