From 42da75b4943e2e46fffc8fcb05145e7d84e824e9 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 5 Jul 2024 10:13:15 -0400
Subject: [PATCH] Revert "overlay/15fcos: ensure valid aleph file"

This reverts commit 7b89c45e92322c0adf14d6ab41cded4e358cc0f9.

We've shipped this in a barrier release now.

See also: https://github.com/coreos/fedora-coreos-tracker/issues/1752
---
 .../lib/systemd/system-preset/45-fcos.preset  |  3 --
 .../system/coreos-fix-aleph-file.service      | 14 ----------
 .../15fcos/usr/libexec/coreos-fix-aleph-file  | 28 -------------------
 3 files changed, 45 deletions(-)
 delete mode 100644 overlay.d/15fcos/usr/lib/systemd/system/coreos-fix-aleph-file.service
 delete mode 100755 overlay.d/15fcos/usr/libexec/coreos-fix-aleph-file

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 eb19f43ebb..95d8087d2b 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
@@ -6,6 +6,3 @@ enable fwupd-refresh.timer
 # Check if wifi firmwares are missing when NetworkManager-wifi is installed
 # https://github.com/coreos/fedora-coreos-tracker/issues/1575
 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
diff --git a/overlay.d/15fcos/usr/lib/systemd/system/coreos-fix-aleph-file.service b/overlay.d/15fcos/usr/lib/systemd/system/coreos-fix-aleph-file.service
deleted file mode 100644
index a160b82714..0000000000
--- a/overlay.d/15fcos/usr/lib/systemd/system/coreos-fix-aleph-file.service
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove after the next barrier release
-
-[Unit]
-Description=Fix CoreOS Aleph File
-Documentation=https://github.com/coreos/fedora-coreos-tracker/issues/1724
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/coreos-fix-aleph-file
-RemainAfterExit=yes
-MountFlags=slave
-
-[Install]
-WantedBy=multi-user.target
diff --git a/overlay.d/15fcos/usr/libexec/coreos-fix-aleph-file b/overlay.d/15fcos/usr/libexec/coreos-fix-aleph-file
deleted file mode 100755
index 9fd52b01fd..0000000000
--- a/overlay.d/15fcos/usr/libexec/coreos-fix-aleph-file
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/bash
-
-# This script removes the extra `version` field
-# which was shipped in a couple of builds
-# when switching to the `build` field
-# To be removed after the next barrier release.
-# see https://github.com/coreos/fedora-coreos-tracker/issues/1724 for more details
-
-set -euo pipefail
-
-ALEPH_FILE=/sysroot/.coreos-aleph-version.json
-
-if ! jq -e 'has("build") and has("version")' ${ALEPH_FILE}; then
-    echo "Aleph file does not require fixing"
-    exit
-fi
-
-echo "Aleph file is invalid; fixing"
-
-# remount /sysroot as writable
-mount -o rw,remount /sysroot
-
-# remove field "build"
-fixed_aleph=$(jq 'del(.build)' ${ALEPH_FILE})
-
-echo "$fixed_aleph" > ${ALEPH_FILE}
-
-echo "Aleph file is fixed"