From b76cf9ae8b7ad33c1b853fc932a07489b285f2d0 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 22 Mar 2023 12:16:46 -0400 Subject: [PATCH] Revert "overlay/15fcos: upgrade bootloader on aarch64 at boot" This reverts commit 8ce6fd6827b06e3c462ddc8c18d2fe1bdc7f5e86. The testing-devel promotion with this has already happened in https://github.com/coreos/fedora-coreos-config/pull/2315 and we have already shipped a `next` with the unit, so we can drop it now (before we execute the `next-devel`->`next` promotion) to prevent it from shipping in more than one release per stream. We can do this because we have barriers. Full context in 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 deletions(-) delete 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 4e4e9da284..fd18bec843 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,6 +1,3 @@ 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 deleted file mode 100644 index 43c9312e9d..0000000000 --- a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service +++ /dev/null @@ -1,15 +0,0 @@ -# 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