From 8ce6fd6827b06e3c462ddc8c18d2fe1bdc7f5e86 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 17 Mar 2023 14:19:20 -0400 Subject: [PATCH] overlay/15fcos: upgrade bootloader on aarch64 at boot On aarch64, kernel 6.2 won't boot with older versions of GRUB. In preparation for switching to the new kernel, add a systemd service that uses bootupd to update the bootloader on aarch64 systems. Revert this after the next barrier release. For https://github.com/coreos/fedora-coreos-tracker/issues/1441. --- .../usr/lib/systemd/system-preset/45-fcos.preset | 3 +++ .../coreos-bootupctl-update-aarch64.service | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service diff --git a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset index fd18bec843..4e4e9da284 100644 --- a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset +++ b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset @@ -1,3 +1,6 @@ enable coreos-check-ssh-keys.service # Check if cgroupsv1 is still being used enable coreos-check-cgroups.service +# Upgrade aarch64 bootloader to avoid +# https://github.com/coreos/fedora-coreos-tracker/issues/1441 +enable coreos-bootupctl-update-aarch64.service diff --git a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service b/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service new file mode 100644 index 0000000000..43c9312e9d --- /dev/null +++ b/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service @@ -0,0 +1,15 @@ +# Remove after the next barrier release +# https://github.com/coreos/fedora-coreos-tracker/issues/1441 + +[Unit] +Description=Update aarch64 Bootloader +ConditionArchitecture=arm64 +ConditionFirmware=uefi + +[Service] +Type=oneshot +ExecStart=/usr/bin/bootupctl update +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target