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 97a80fa224..eb19f43ebb 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 @@ -9,6 +9,3 @@ enable coreos-check-wireless-firmwares.service # Strip extraneous field in aleph files to avoid bootupctl failing # https://github.com/coreos/fedora-coreos-tracker/issues/1724 enable coreos-fix-aleph-file.service -# Upgrade bootloader on Secure Boot-enabled nodes to avoid -# https://github.com/coreos/fedora-coreos-tracker/issues/1752 -enable coreos-bootupctl-update-secureboot.service diff --git a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service b/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service deleted file mode 100644 index 7c10b7fdcc..0000000000 --- a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-secureboot.service +++ /dev/null @@ -1,20 +0,0 @@ -# Remove after the next barrier release - -[Unit] -Description=Update Bootloader for Secure Boot-enabled Systems -Documentation=https://github.com/coreos/fedora-coreos-tracker/issues/1752 -ConditionSecurity=uefi-secureboot - -# make sure to run after the aleph file is fixed -# see https://github.com/coreos/fedora-coreos-tracker/issues/1724 -After=coreos-fix-aleph-file.service -Requires=coreos-fix-aleph-file.service - -[Service] -Type=oneshot -ExecStart=/usr/libexec/coreos-update-bootloader -RemainAfterExit=yes -MountFlags=slave - -[Install] -WantedBy=multi-user.target diff --git a/overlay.d/15fcos/usr/libexec/coreos-update-bootloader b/overlay.d/15fcos/usr/libexec/coreos-update-bootloader deleted file mode 100755 index 1c7d65da5d..0000000000 --- a/overlay.d/15fcos/usr/libexec/coreos-update-bootloader +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -euo pipefail - -# This script update the bootloader using bootupd -# and also detect RAID-1 setups as those requires -# extra steps - -if [ -e /dev/disk/by-label/EFI-SYSTEM ]; then - echo "Found ESP; calling 'bootupctl update'" - bootupctl update - exit -fi - -# handle RAID case manually since bootupd doesn't support it -# https://github.com/coreos/bootupd/issues/132 -i=1 -while true; do - if [ ! -e /dev/disk/by-label/esp-$i ]; then - break - fi - echo "Found ESP (replica $i); updating" - mount /dev/disk/by-label/esp-$i /boot/efi - cp -rp /usr/lib/bootupd/updates/EFI /boot/efi - umount /boot/efi - i=$((i+1)) -done -sync