From 394222a77a55a4b180cbfea726ab0438b2dee2d8 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 1 Oct 2023 06:17:36 -0500
Subject: ISO: Simplify aarch64 creation

---
 image/iso-share/iso-params-aarch64 | 2 +-
 image/iso-share/post-aarch64.sh    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'image/iso-share')

diff --git a/image/iso-share/iso-params-aarch64 b/image/iso-share/iso-params-aarch64
index a5989d8..e32e415 100644
--- a/image/iso-share/iso-params-aarch64
+++ b/image/iso-share/iso-params-aarch64
@@ -1 +1 @@
---grub2-boot-info -no-emul-boot -isohybrid-gpt-basdat --efi-boot efi.img -efi-boot-part --efi-boot-image
+-isohybrid-gpt-basdat -append_partition 2 0xef efi64.img -e --interval:appended_partition_2:all:: -no-emul-boot
diff --git a/image/iso-share/post-aarch64.sh b/image/iso-share/post-aarch64.sh
index 6880978..6e13293 100755
--- a/image/iso-share/post-aarch64.sh
+++ b/image/iso-share/post-aarch64.sh
@@ -48,8 +48,6 @@ cat >cdroot/System/Library/CoreServices/SystemVersion.plist <<PLIST
 	<string>1.0</string>
 </dict>
 PLIST
-#cp disk-label cdroot/System/Library/CoreServices/.disk_label
-#echo 'Adélie 64-bit' >cdroot/System/Library/CoreServices/.disk_label.contentDetails
 cp efi64.exe cdroot/System/Library/CoreServices/boot.efi
 
 if ! type mkfs.fat>/dev/null || ! type mtools>/dev/null; then
@@ -64,7 +62,6 @@ else
 	mkfs.fat efi64.img
 	mmd A:/EFI
 	mmd A:/EFI/BOOT
-	mcopy efi64.exe A:/EFI/BOOT/bootaa64.efi
+	mcopy efi64.exe A:/EFI/BOOT/BOOTAA64.EFI
 	rm efi64.exe mtoolsrc
-	mv efi64.img cdroot/efi.img
 fi
-- 
cgit v1.2.3-60-g2f50