Preserve upstream desktop metadata

Keep the base image's kinoite or silverblue identity intact.
Detect AeroCore Deck behavior from its image name instead.

2 files changed, 2 insertions, 14 deletions

diff --git a/build_files/image-info b/build_files/image-info
index 84c6495..a52d666 100755
--- a/build_files/image-info
+++ b/build_files/image-info
@@ -17,7 +17,7 @@ OSTREE_REGISTRY="${OSTREE_REGISTRY:-docker://ghcr.io}"
 OSTREE_NAMESPACE="${OSTREE_NAMESPACE:-$IMAGE_VENDOR}"
 IMAGE_REF="${OSTREE_IMAGE_REF:-ostree-image-signed:${OSTREE_REGISTRY%/}/$OSTREE_NAMESPACE/$IMAGE_NAME}"
 IMAGE_BRANCH_NORMALIZED="$IMAGE_BRANCH"
-BASE_IMAGE_NAME="bazzite-deck"
+BASE_IMAGE_NAME=$(jq -er '."base-image-name"' < "$IMAGE_INFO")
 
 if [[ $IMAGE_BRANCH_NORMALIZED == "main" ]]; then
   IMAGE_BRANCH_NORMALIZED="stable"
diff --git a/build_files/patch-bazzite-deck-identity.sh b/build_files/patch-bazzite-deck-identity.sh
index 600d97e..078b76c 100755
--- a/build_files/patch-bazzite-deck-identity.sh
+++ b/build_files/patch-bazzite-deck-identity.sh
@@ -7,9 +7,7 @@ hardware_setup="${1:-/usr/libexec/bazzite-hardware-setup}"
 # shellcheck disable=SC2016
 old_condition='if [[ "$IMAGE_NAME" != *deck* && "$IMAGE_NAME" != *dx* ]]; then'
 # shellcheck disable=SC2016
-new_condition='if [[ "$IMAGE_NAME" != aerocore-os && "$IMAGE_NAME" != *deck* && "$IMAGE_NAME" != *dx* && "$BASE_IMAGE_NAME" != *deck* && "$BASE_IMAGE_NAME" != *dx* ]]; then'
-# shellcheck disable=SC2016
-base_image_assignment='BASE_IMAGE_NAME=$(jq -r '\''."base-image-name"'\'' < $IMAGE_INFO)'
+new_condition='if [[ "$IMAGE_NAME" != aerocore-os && "$IMAGE_NAME" != *deck* && "$IMAGE_NAME" != *dx* ]]; then'
 
 if grep -Fqx "$new_condition" "$hardware_setup"; then
   exit 0
@@ -20,23 +18,13 @@ if [[ "$(grep -Fxc "$old_condition" "$hardware_setup")" -ne 1 ]]; then
   exit 1
 fi
 
-add_base_image_assignment=0
-if ! grep -Fqx "$base_image_assignment" "$hardware_setup"; then
-  add_base_image_assignment=1
-fi
-
 patched_file=$(mktemp)
 trap 'rm -f "$patched_file"' EXIT
 
 awk \
   -v old_condition="$old_condition" \
   -v new_condition="$new_condition" \
-  -v base_image_assignment="$base_image_assignment" \
-  -v add_base_image_assignment="$add_base_image_assignment" \
   '$0 == old_condition {
-    if (add_base_image_assignment) {
-      print base_image_assignment
-    }
     print new_condition
     next
   }