From 5c3fcdc5b5b87dfd456b1049d6f67859645e9bea Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2024 10:56:33 +0000 Subject: Revert "common: Add workaround for issue with newer GRUB2" Should be safe to revert now that a fix has been pushed to GRUB2. See: https://bugzilla.redhat.com/show_bug.cgi?id=2305291 See: https://bodhi.fedoraproject.org/updates/FEDORA-2024-2e76a9ff56 This reverts commit c23d23e933971a7ef90950baf9c2129c474ae5b7. --- diff --git a/common.yaml b/common.yaml index c28193b..4faa0d9 100644 --- a/common.yaml +++ b/common.yaml @@ -15,8 +15,6 @@ include: - initramfs.yaml # Read only sysroot - sysroot-ro.yaml - # Workaround for https://github.com/fedora-silverblue/issue-tracker/issues/587 - - grub2-workaround.yaml # systemd-pcrphase module fails on ppc64le: # https://gitlab.com/fedora/ostree/sig/-/issues/44 diff --git a/grub2-workaround.yaml b/grub2-workaround.yaml deleted file mode 100644 index 3b58a9e..0000000 --- a/grub2-workaround.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Temporarily disable new GRUB2 config options until we can ensure that we -# have an updated bootloader via bootupd. -# This is workaround for: https://bugzilla.redhat.com/show_bug.cgi?id=2305291 -# See: https://github.com/fedora-silverblue/issue-tracker/issues/587 -postprocess: - - | - #!/usr/bin/env bash - set -xeuo pipefail - - # Completely disable this module - sed -i '2i exit 0' /etc/grub.d/25_bli - - # Skip check that was not performed in previous Fedora versions - sed -i '/fwsetup --is-supported/d' /etc/grub.d/30_uefi-firmware - sed -i '/\tif/d' /etc/grub.d/30_uefi-firmware - sed -i '/\tfi/d' /etc/grub.d/30_uefi-firmware - sed -i 's/\t\t/\t/' /etc/grub.d/30_uefi-firmware - - # Verify that the content matches what we expect the file to look like. - # This will fail the build here instead of breaking users' systems. - hash="5a77a16c6a94e664e2e96a870f4531b9a0b4e63be1f46751d01e774629a8c84b" - echo "$hash /etc/grub.d/30_uefi-firmware" | sha256sum -c