From cc6d75a6db0a316de56cb0abc78206fa1bcef1cd Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 16:56:22 +0800 Subject: Patch brh to preserve current image registry --- build_files/patch-bazzite-rollback-helper.sh | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 build_files/patch-bazzite-rollback-helper.sh (limited to 'build_files/patch-bazzite-rollback-helper.sh') diff --git a/build_files/patch-bazzite-rollback-helper.sh b/build_files/patch-bazzite-rollback-helper.sh new file mode 100644 index 0000000..d5b3f21 --- /dev/null +++ b/build_files/patch-bazzite-rollback-helper.sh @@ -0,0 +1,43 @@ +#!/usr/bin/bash + +set -euo pipefail + +file=/usr/bin/bazzite-rollback-helper + +if [[ ! -f "$file" ]]; then + echo "Unable to locate Bazzite rollback helper: $file" >&2 + exit 1 +fi + +if grep -Fq 'current_image_prefix()' "$file"; then + exit 0 +fi + +patched_file=$(mktemp) +awk ' + /^signing_scheme\(\) \{/ { + print "signing_scheme() {" + print " local current=$(rpm-ostree status -b --json | jq -r '\''.deployments[] | select(.booted == true) | .["container-image-reference"]'\'')" + print " local scheme=\"ostree-unverified-registry\"" + print " [[ \"$current\" == *\"ostree-image-signed\"* ]] && scheme=\"ostree-image-signed\"" + print " echo \"$scheme:docker://\"" + print "}" + print "" + print "current_image_prefix() {" + print " local current" + print " current=$(rpm-ostree status -b --json | jq -r '\''.deployments[] | select(.booted == true) | .["container-image-reference"]'\'')" + print " current=\"${current#ostree-image-signed:}\"" + print " current=\"${current#ostree-unverified-registry:}\"" + print " current=\"${current#docker://}\"" + print " echo \"${current%/*}\"" + print "}" + skip=1 + next + } + skip && /^warn_if_de_mismatch\(\) \{/ { skip=0; print; next } + skip { next } + { gsub("ostree-image-signed:docker://ghcr.io/ublue-os/", "$(signing_scheme)/$(current_image_prefix)/"); print } +' "$file" > "$patched_file" + +install -m 0755 "$patched_file" "$file" +rm -f "$patched_file" -- cgit v1.2.3 From f715d88bb1efd97aa45f0e836418027ab642dce6 Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 17:01:42 +0800 Subject: Fix brh patch script permissions --- build_files/patch-bazzite-rollback-helper.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build_files/patch-bazzite-rollback-helper.sh (limited to 'build_files/patch-bazzite-rollback-helper.sh') diff --git a/build_files/patch-bazzite-rollback-helper.sh b/build_files/patch-bazzite-rollback-helper.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From bb6bc344477d55748033c286db707d75ab9c954c Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 17:45:26 +0800 Subject: Fix booted image reference parsing --- build_files/patch-bazzite-rollback-helper.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build_files/patch-bazzite-rollback-helper.sh') diff --git a/build_files/patch-bazzite-rollback-helper.sh b/build_files/patch-bazzite-rollback-helper.sh index d5b3f21..eb4341f 100755 --- a/build_files/patch-bazzite-rollback-helper.sh +++ b/build_files/patch-bazzite-rollback-helper.sh @@ -17,7 +17,7 @@ patched_file=$(mktemp) awk ' /^signing_scheme\(\) \{/ { print "signing_scheme() {" - print " local current=$(rpm-ostree status -b --json | jq -r '\''.deployments[] | select(.booted == true) | .["container-image-reference"]'\'')" + print " local current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .["container-image-reference"] // empty'\'')" print " local scheme=\"ostree-unverified-registry\"" print " [[ \"$current\" == *\"ostree-image-signed\"* ]] && scheme=\"ostree-image-signed\"" print " echo \"$scheme:docker://\"" @@ -25,7 +25,11 @@ awk ' print "" print "current_image_prefix() {" print " local current" - print " current=$(rpm-ostree status -b --json | jq -r '\''.deployments[] | select(.booted == true) | .["container-image-reference"]'\'')" + print " current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .["container-image-reference"] // empty'\'')" + print " if [[ -z \"$current\" ]]; then" + print " echo \"Unable to determine the current booted image reference.\" >&2" + print " return 1" + print " fi" print " current=\"${current#ostree-image-signed:}\"" print " current=\"${current#ostree-unverified-registry:}\"" print " current=\"${current#docker://}\"" -- cgit v1.2.3 From 305ab714399a343e6fd9eeeb18d7b210b2903bad Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 17:57:19 +0800 Subject: Fix generated brh jq field access --- build_files/patch-bazzite-rollback-helper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files/patch-bazzite-rollback-helper.sh') diff --git a/build_files/patch-bazzite-rollback-helper.sh b/build_files/patch-bazzite-rollback-helper.sh index eb4341f..e944d17 100755 --- a/build_files/patch-bazzite-rollback-helper.sh +++ b/build_files/patch-bazzite-rollback-helper.sh @@ -17,7 +17,7 @@ patched_file=$(mktemp) awk ' /^signing_scheme\(\) \{/ { print "signing_scheme() {" - print " local current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .["container-image-reference"] // empty'\'')" + print " local current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .[\"container-image-reference\"] // empty'\'')" print " local scheme=\"ostree-unverified-registry\"" print " [[ \"$current\" == *\"ostree-image-signed\"* ]] && scheme=\"ostree-image-signed\"" print " echo \"$scheme:docker://\"" @@ -25,7 +25,7 @@ awk ' print "" print "current_image_prefix() {" print " local current" - print " current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .["container-image-reference"] // empty'\'')" + print " current=$(rpm-ostree status -b --json | jq -r '\''.deployments | map(select(.booted == true)) | first | .[\"container-image-reference\"] // empty'\'')" print " if [[ -z \"$current\" ]]; then" print " echo \"Unable to determine the current booted image reference.\" >&2" print " return 1" -- cgit v1.2.3 From 07853e72cb08f745c04e04f756452a76fd4cc8cf Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 22:39:55 +0800 Subject: Fix brh image ref slash handling --- build_files/patch-bazzite-rollback-helper.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'build_files/patch-bazzite-rollback-helper.sh') diff --git a/build_files/patch-bazzite-rollback-helper.sh b/build_files/patch-bazzite-rollback-helper.sh index e944d17..6d565b0 100755 --- a/build_files/patch-bazzite-rollback-helper.sh +++ b/build_files/patch-bazzite-rollback-helper.sh @@ -40,7 +40,12 @@ awk ' } skip && /^warn_if_de_mismatch\(\) \{/ { skip=0; print; next } skip { next } - { gsub("ostree-image-signed:docker://ghcr.io/ublue-os/", "$(signing_scheme)/$(current_image_prefix)/"); print } + { + gsub("ostree-image-signed:docker://[^\"]+/", "$(signing_scheme)$(current_image_prefix)/") + gsub("\\$\\(signing_scheme\\)/\\$\\(current_image_prefix\\)/", "$(signing_scheme)$(current_image_prefix)/") + gsub("\\$\\(signing_scheme\\)/", "$(signing_scheme)") + print + } ' "$file" > "$patched_file" install -m 0755 "$patched_file" "$file" -- cgit v1.2.3