From 8c5c609f3f4e61ea1e4013fec5e0f34d424cb2b5 Mon Sep 17 00:00:00 2001
From: Jeffrey Alan Scudder <me@jas.life>
Date: Mon, 23 Mar 2026 00:55:31 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20ISO=20generation=20in=20docker-build.sh?=
 =?UTF-8?q?=20=E2=80=94=20use=20append=5Fpartition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The xorriso call referenced efi.img inside the staging dir before
it was copied there, causing silent failure. Align with the working
ac-os generate_template_iso() approach using -append_partition.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 fedac/native/docker-build.sh | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/fedac/native/docker-build.sh b/fedac/native/docker-build.sh
index e5b3a9143..ccd83b123 100644
--- a/fedac/native/docker-build.sh
+++ b/fedac/native/docker-build.sh
@@ -375,27 +375,21 @@ mmd -i "$EFI_IMG" ::EFI ::EFI/BOOT 2>/dev/null
 mcopy -i "$EFI_IMG" "$BUILD/vmlinuz" ::EFI/BOOT/BOOTX64.EFI
 mcopy -i "$EFI_IMG" "$ISO_DIR/config.json" ::config.json
 
-# Build ISO with EFI boot support
+# Build hybrid ISO with xorriso (EFI boot via El Torito + GPT for dd/USB)
+# Uses -append_partition to attach the EFI image, matching ac-os generate_template_iso().
 if command -v xorriso &>/dev/null; then
     xorriso -as mkisofs \
         -o "$ISO_OUT" \
-        -e efi.img -no-emul-boot \
-        -isohybrid-gpt-basdat \
-        "$ISO_DIR" 2>/dev/null
-    # Embed EFI image into ISO for hybrid boot
-    cp "$EFI_IMG" "$ISO_DIR/efi.img"
-    xorriso -as mkisofs \
-        -o "$ISO_OUT" \
-        -e efi.img -no-emul-boot \
-        "$ISO_DIR" 2>/dev/null
-elif command -v genisoimage &>/dev/null; then
-    genisoimage -o "$ISO_OUT" \
-        -efi-boot efi.img \
+        -V "AC_NATIVE" \
+        -J -joliet-long \
+        -append_partition 2 0xef "$EFI_IMG" \
+        -e --interval:appended_partition_2:all:: \
         -no-emul-boot \
-        "$ISO_DIR" 2>/dev/null
+        -isohybrid-gpt-basdat \
+        "$ISO_DIR" 2>&1 | grep -v "^xorriso\|^Drive\|^Media" || true
 else
-    # Fallback: raw disk image (dd-able)
-    log "  No ISO tools — creating raw disk image"
+    # Fallback: raw EFI disk image (dd-able)
+    log "  No xorriso — creating raw disk image"
     cp "$EFI_IMG" "$ISO_OUT"
 fi
 
-- 
2.51.2