From 2a5ce6229e569801e432ba4184943d9954fcb42d Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 8 Feb 2023 21:41:42 +0100
Subject: [PATCH] fix aarch64 iso creation

---
 CHANGELOG                            | 2 +-
 usr/lib/archboot/iso.sh              | 5 +++--
 usr/share/archboot/doc/archboot.html | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0931e6f81..57356fcf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,7 +16,7 @@ Environment changes:
 - new MOTD with listed architecture and Manage Archboot section
 - shrink aarch64 iso ->125M less by removing dtbs, replacing Image 
   with Image.gz kernel and remove /EFI directory
-- shrink x86_64 iso -> 25M less by removing /EFI directory
+- shrink x86_64 iso with new grub layout -> 35M saved 
 - remove not installed packages from local pacman database
 update-installer:
 - added network check
diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index 6f111c4e2..bac73d03d 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -232,9 +232,10 @@ _grub_mkrescue() {
     # --modification-date= for boot.catalog
     # -- --rm_r /efi .disk/ /boot/grub/{roms,locale} ${_RESCUE_REMOVE} for removing reproducibility breakers
     echo "Generating ${_ARCH} hybrid ISO..."
-    [[ "${_ARCH}" == "x86_64" ]] && _RESCUE_REMOVE="mach_kernel /System"
+    [[ "${_ARCH}" == "x86_64" ]] && _RESCUE_REMOVE="mach_kernel /System /boot/grub/i386-efi /boot/grub/x86_64-efi"
+    [[ "${_ARCH}" == "aarch64" ]] && _RESCUE_REMOVE="/boot/grub/arm64-efi"
     #shellcheck disable=SC2086
-    grub-mkrescue --set_all_file_dates 'Jan 1 00:00:00 UTC 1970' --modification-date=1970010100000000 --compress=xz --fonts="ter-u16n" --locales="" --themes="" -o "${_IMAGENAME}.iso" "${_ISODIR}"/ "boot/grub/archboot-main-grub.cfg=${_GRUB_CONFIG}" "boot/grub/grub.cfg=/usr/share/archboot/grub/archboot-iso-grub.cfg" -- --rm_r /boot/grub/{roms,i386-efi,locale,x86_64-efi} /efi .disk/ ${_RESCUE_REMOVE} &> "${_IMAGENAME}.log"
+    grub-mkrescue --set_all_file_dates 'Jan 1 00:00:00 UTC 1970' --modification-date=1970010100000000 --compress=xz --fonts="ter-u16n" --locales="" --themes="" -o "${_IMAGENAME}.iso" "${_ISODIR}"/ "boot/grub/archboot-main-grub.cfg=${_GRUB_CONFIG}" "boot/grub/grub.cfg=/usr/share/archboot/grub/archboot-iso-grub.cfg" -- --rm_r /boot/grub/{roms,locale} /efi .disk/ ${_RESCUE_REMOVE} &> "${_IMAGENAME}.log"
 }
 
 _reproducibility_iso() {
diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html
index 827a73977..c0a37c56f 100644
--- a/usr/share/archboot/doc/archboot.html
+++ b/usr/share/archboot/doc/archboot.html
@@ -665,7 +665,7 @@ initrd (loop)/boot/initramfs-x86_64.img
 <li>Please read <a href="https://www.rodsbooks.com/efi-bootloaders/secureboot.html#initial_shim"><strong>Roderick Smith’s guide</strong></a> first for initial shim setup.</li>
 <li>In order to boot in <a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot</strong></a> mode on first boot:
 <ul>
-<li>you need to add the <strong>hash</strong> of <strong>grub</strong> and <strong>kernel</strong> from disk:<br><strong>/EFI/BOOT/GRUB&lt;ARCH&gt;.EFI</strong> and <strong>/EFI/BOOT/VMLINUZ_&ltARCH&gt</strong> </li>
+<li>you need to add the <strong>hash</strong> of <strong>grub</strong> and <strong>kernel</strong> from disk:<br><strong>/EFI/BOOT/GRUB&lt;ARCH&gt;.EFI</strong> and <strong>/boot/vmlinuz-&ltARCH&gt</strong> </li>
 </ul></li>
 <li>Tools included for key management: <strong>KeyTool, HashTool, mokutil, sbsigntools, sbctl</strong> and <strong>mkkeys.sh</strong></li>
 <li>setup script supports the following <a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot</strong></a> layout: