From 62b3df125b2312b72e02c3a2a95cdc365ef9db71 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Thu, 27 Jun 2024 11:20:04 +0200 Subject: [PATCH] overlay/15fcos: strip extraneous `version` field from aleph file This causes bootupctl to fails while parsing the file. The extra field was introduced in https://github.com/coreos/coreos-assembler/commit/c2d37f4005e0e7c98d24c5f561c149ab7fd4dfce then quickly reverted in https://github.com/coreos/coreos-assembler/pull/3686 Still, a couple of builds (39.20231204.1.0 and 39.20231204.2.1) went out with the change. Fixing this will allow bootupctl to function properly on nodes deployed with this version. This jq filter is idempotent so it's safe to run on all nodes. This should be removed after the next barrier release. Fixes https://github.com/coreos/fedora-coreos-tracker/issues/1724 --- .../systemd/system/coreos-fix-aleph-file.service | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 overlay.d/15fcos/usr/lib/systemd/system/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 new file mode 100644 index 0000000000..8528d4ba1a --- /dev/null +++ b/overlay.d/15fcos/usr/lib/systemd/system/coreos-fix-aleph-file.service @@ -0,0 +1,13 @@ +# Remove after the next barrier release +# https://github.com/coreos/fedora-coreos-tracker/issues/1724 + +[Unit] +Description=Remove extra attribute from aleph file + +[Service] +Type=oneshot +ExecStart=cat <<< $(jq 'del(.version)' /sysroot/.coreos-aleph-version.json) > /sysroot/.coreos-aleph-version.json +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target