From b9dd563bf6289c1d5727d3a692ea031bd801a0b3 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Sep 27 2022 08:09:49 +0000
Subject: [PATCH 1/2] common: add bootupd


We need to make it easier to update the bootloader on these variants
because unlike on traditional systems, it's not updated automatically
with the rest of the system. Add bootupd for that.

This would allow fixing issues like:
- https://github.com/coreos/rpm-ostree/issues/3715
- https://github.com/fedora-silverblue/issue-tracker/issues/120#issuecomment-979268679

It won't be enabled by default and as mentioned in that comment requires
work in Anaconda to be seamless. But at least with this users should be
able to adopt and update:

https://github.com/coreos/bootupd/blob/main/README-design.md

See also the tracker issue where we did this for Fedora CoreOS:

https://github.com/coreos/fedora-coreos-tracker/issues/510

---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 27d2702..ca68688 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -9,6 +9,7 @@ packages:
   - git-core
   - lvm2
   - rpm-ostree
+  - bootupd
   # Container management
   - buildah
   - podman

From c168ce92e4458f3862f29a8facc05b3f33d5cf94 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 27 2022 08:09:49 +0000
Subject: [PATCH 2/2] common: Move bootupd to arch specific package list


We only have bootup for x86 & aarch64.

Fixes: d34e2ee common: add bootupd

---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index ca68688..c4c0000 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -9,7 +9,6 @@ packages:
   - git-core
   - lvm2
   - rpm-ostree
-  - bootupd
   # Container management
   - buildah
   - podman
@@ -50,8 +49,8 @@ check-groups:
 
 default_target: graphical.target
 
-# Keep this in sync with fedora-atomic-host.json from fedora-atomic
 packages-aarch64:
+  - bootupd
   - grub2-efi
   - ostree-grub2
   - efibootmgr
@@ -66,6 +65,7 @@ packages-ppc64le:
   - grub2
   - ostree-grub2
 packages-x86_64:
+  - bootupd
   - grub2-efi-ia32
   - grub2-efi-x64
   - grub2-pc