[PATCH v1 09/15] rename seabios_withgrub images to seabios.

[Denis 'GNUtoo' Carikli]

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 resources/packages/release/test       |  4 ++--
 resources/packages/roms_helper/boot   | 14 +++++++++++++-
 website/pages/docs/install/install.md |  8 ++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/resources/packages/release/test b/resources/packages/release/test
index 096a3be..f3b7faa 100755
--- a/resources/packages/release/test
+++ b/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
 
diff --git a/resources/packages/roms_helper/boot 
b/resources/packages/roms_helper/boot
index 588810c..b95f390 100755
--- a/resources/packages/roms_helper/boot
+++ b/resources/packages/roms_helper/boot
@@ -385,7 +385,19 @@ mkRomsWithGrub() {
                fi
 
                tmpgrubrom="$(make_grubrom_from_keymap "${keymap}" 
"${tmprompath}" "${cbfstool}" "${grub_path_in_cbfs}")"
-               if [ "${initmode}" = "normal" ]; then
+
+               # 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
                        
newrompath="${romdir}/${firstpayloadname}_${board}_${initmode}_${displaymode}_${keymap}.rom"
diff --git a/website/pages/docs/install/install.md 
b/website/pages/docs/install/install.md
index d7c749e..b6e4253 100644
--- a/website/pages/docs/install/install.md
+++ b/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?
 ============================
-- 
2.46.0