Normalize bootloader situation

Each image should have exactly one bootloader installed: either
GRUB2 for most images, or sd-boot for the experimental one.

efibootmgr is useful regardless of the bootloader, so it should
always be installed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
(cherry picked from commit 5a833e9841344e69f05e3438685f115ac14d841d)

fedora-riscv64-developer-f40.ks

@@ -44,8 +44,8 @@ grub2-efi-riscv64-modules
 efibootmgr
 
 # Add for sd-boot
-# systemd-boot-unsigned
-# edk2-ext4
+#systemd-boot-unsigned
+#edk2-ext4
 
 kernel
 kernel-core

fedora-riscv64-minimal-f40-experimental.ks

@@ -42,7 +42,6 @@ poweroff
 -grub2-tools
 -grub2-efi-riscv64-cdboot
 -grub2-common
-
 efibootmgr
 
 # Add for sd-boot

fedora-riscv64-minimal-f40-kiwi.ks

@@ -36,11 +36,11 @@ poweroff
 # GRUB2
 grub2-efi-riscv64
 grub2-efi-riscv64-modules
-# efibootmgr
+efibootmgr
 
 # Add for sd-boot
-systemd-boot-unsigned
-# edk2-ext4
+#systemd-boot-unsigned
+#edk2-ext4
 
 # python3-virt-firmware
 

fedora-riscv64-minimal-f40.ks

@@ -36,9 +36,11 @@ poweroff
 # GRUB2
 grub2-efi-riscv64
 grub2-efi-riscv64-modules
+efibootmgr
 
 # Add for sd-boot
-systemd-boot-unsigned
+#systemd-boot-unsigned
+#edk2-ext4
 
 kernel
 kernel-core