Monorepo for Aesthetic.Computer
aesthetic.computer
fix: ISO generation in docker-build.sh — use append_partition
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>
+10
-16
+10
-16
fedac/native/docker-build.sh
+10
-16
fedac/native/docker-build.sh
···
375
375
mcopy -i "$EFI_IMG" "$BUILD/vmlinuz" ::EFI/BOOT/BOOTX64.EFI
376
376
mcopy -i "$EFI_IMG" "$ISO_DIR/config.json" ::config.json
377
377
378
-
# Build ISO with EFI boot support
378
+
# Build hybrid ISO with xorriso (EFI boot via El Torito + GPT for dd/USB)
379
+
# Uses -append_partition to attach the EFI image, matching ac-os generate_template_iso().
379
380
if command -v xorriso &>/dev/null; then
380
381
xorriso -as mkisofs \
381
382
-o "$ISO_OUT" \
382
-
-e efi.img -no-emul-boot \
383
-
-isohybrid-gpt-basdat \
384
-
"$ISO_DIR" 2>/dev/null
385
-
# Embed EFI image into ISO for hybrid boot
386
-
cp "$EFI_IMG" "$ISO_DIR/efi.img"
387
-
xorriso -as mkisofs \
388
-
-o "$ISO_OUT" \
389
-
-e efi.img -no-emul-boot \
390
-
"$ISO_DIR" 2>/dev/null
391
-
elif command -v genisoimage &>/dev/null; then
392
-
genisoimage -o "$ISO_OUT" \
393
-
-efi-boot efi.img \
383
+
-V "AC_NATIVE" \
384
+
-J -joliet-long \
385
+
-append_partition 2 0xef "$EFI_IMG" \
386
+
-e --interval:appended_partition_2:all:: \
394
387
-no-emul-boot \
395
-
"$ISO_DIR" 2>/dev/null
388
+
-isohybrid-gpt-basdat \
389
+
"$ISO_DIR" 2>&1 | grep -v "^xorriso\|^Drive\|^Media" || true
396
390
else
397
-
# Fallback: raw disk image (dd-able)
398
-
log " No ISO tools — creating raw disk image"
391
+
# Fallback: raw EFI disk image (dd-able)
392
+
log " No xorriso — creating raw disk image"
399
393
cp "$EFI_IMG" "$ISO_OUT"
400
394
fi
401
395