Merge remote-tracking branch 'origin/merge-requests/256'

After more than ten years, archiso is once again using GRUB. GRUB! Only this time, it's for UEFI not BIOS boot.

By plainlinen
* origin/merge-requests/256:
  Update documentation for uefi x64 grub boot modes
  Use grub for uefi x64 boot modes in profiledef.sh
  Add *_uefi-x64.grub.* functions to mkarchiso
  Add useful grub menu entries to grub.cfg

Closes #63 and #159

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/256.

2 files changed, 3 insertions, 3 deletions

diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index 0e5db49..5fc8d73 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -17,7 +17,7 @@ fi
 menuentry "Arch Linux (x86_64, UEFI)" {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index 34060f2..93002d4 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -9,8 +9,8 @@ iso_version="$(date +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
-	   'uefi-ia32.grub.esp' 'uefi-x64.systemd-boot.esp'
-	   'uefi-ia32.grub.eltorito' 'uefi-x64.systemd-boot.eltorito')
+           'uefi-ia32.grub.esp' 'uefi-x64.grub.esp'
+           'uefi-ia32.grub.eltorito' 'uefi-x64.grub.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="erofs"