From 2fda060e855080cb329c5d637a7dfca68e8e8999 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Mar 06 2025 19:02:39 +0000
Subject: Remove grub2-workaround


Remove grub2-workaround, bug has been fixed.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2305291

Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/fedora-iot-base.yaml b/fedora-iot-base.yaml
index 11e982f..1c13f3f 100644
--- a/fedora-iot-base.yaml
+++ b/fedora-iot-base.yaml
@@ -1,7 +1,5 @@
 include: 
   - bootupd.yaml
-  # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2305291
-  - grub2-workaround.yaml
   # Enable composefs
   - composefs.yaml
 ref: fedora/rawhide/${basearch}/iot
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