From f878489f61783f1b707b128854dba501c88ea4ad Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 19 Apr 2024 20:22:09 +0200
Subject: [PATCH] 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            | 4 ++--
 fedora-riscv64-minimal-f40-experimental.ks | 1 -
 fedora-riscv64-minimal-f40-kiwi.ks         | 6 +++---
 fedora-riscv64-minimal-f40.ks              | 4 +++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fedora-riscv64-developer-f40.ks b/fedora-riscv64-developer-f40.ks
index 47690ad..f77e0d8 100644
--- a/fedora-riscv64-developer-f40.ks
+++ b/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
diff --git a/fedora-riscv64-minimal-f40-experimental.ks b/fedora-riscv64-minimal-f40-experimental.ks
index a8e1731..6275824 100644
--- a/fedora-riscv64-minimal-f40-experimental.ks
+++ b/fedora-riscv64-minimal-f40-experimental.ks
@@ -42,7 +42,6 @@ poweroff
 -grub2-tools
 -grub2-efi-riscv64-cdboot
 -grub2-common
-
 efibootmgr
 
 # Add for sd-boot
diff --git a/fedora-riscv64-minimal-f40-kiwi.ks b/fedora-riscv64-minimal-f40-kiwi.ks
index ff58fba..4d8a64f 100644
--- a/fedora-riscv64-minimal-f40-kiwi.ks
+++ b/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
 
diff --git a/fedora-riscv64-minimal-f40.ks b/fedora-riscv64-minimal-f40.ks
index 094a3de..4842985 100644
--- a/fedora-riscv64-minimal-f40.ks
+++ b/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