rename seabios_withgrub images to seabios.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>

resources/packages/release/test

@@ -73,8 +73,8 @@ test_qemu_rom_archive()
         archive_files="${archive_files} \
             ${target}/grub_${target}_${cbfb}_${kb}.rom \
             ${target}/grub_${target}_${txtmode}_${kb}.rom \
-            ${target}/seabios_withgrub_${target}_${cbfb}_${kb}.rom \
-            ${target}/seabios_withgrub_${target}_${txtmode}_${kb}.rom \
+            ${target}/seabios_${target}_${cbfb}_${kb}.rom \
+            ${target}/seabios_${target}_${txtmode}_${kb}.rom \
         "
     done
 

resources/packages/roms_helper/boot

@@ -385,6 +385,18 @@ mkRomsWithGrub() {
 		fi
 
 		tmpgrubrom="$(make_grubrom_from_keymap "${keymap}" "${tmprompath}" "${cbfstool}" "${grub_path_in_cbfs}")"
+
+		# Having too much image types complicates things too much for
+		# users. So we even if we can build 2 type of SeaBIOS images,
+		# one with GRUB and one without GRUB, we only want to show a
+		# single image to the user. This also requires to tell users
+		# that they may or may not have GRUB as secondary payload, but
+		# we already have this situation with memtest86+ that may or
+		# may not be in the image depending on the flash size.
+		if [ "${firstpayloadname}" = "seabios_withgrub" ] ; then
+		    firstpayloadname="seabios"
+		fi
+
 		if [ "${initmode}" = "normal" ]  ; then
 			newrompath="${romdir}/${firstpayloadname}_${board}_${initmode}_${keymap}.rom"
 		else

website/pages/docs/install/install.md

@@ -152,13 +152,9 @@ memtest86+, SeaBIOS, Tianacore and so on.
 ### seabios
 
 ROM images with just `seabios` in the file name will start first with the
-SeaBIOS payload. They will only contain SeaBIOS, but may also contain memtest as
-an option in the boot menu.
 
-### seabios\_withgrub
-
-ROM images that have `seabios_withgrub` in the file name start with SeaBIOS
-first, but also have GNU GRUB available in the boot menu when you press ESC.
+SeaBIOS payload. They will only contain SeaBIOS, but may also contain
+memtest and/or GNU GRUB as an option in the boot menu when you press ESC.
 
 Which systems are supported?
 ============================