configs/: replace archisodevice boot parameter with archisosearchuuid

`archisosearchuuid=` first searches for a matching UUID. If that fails,
then it mounts and looks for a `/boot/${archisosearchuuid}.uuid` file in
all detected block devices (in whatever order `blkid` lists them).

This implements "file system transposition" without relaying on boot
loader specific features and does not tie us to GRUB anymore.

Related to https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio-archiso/-/merge_requests/48
Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/217

1 files changed, 1 insertions, 10 deletions

diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index c76657b..38164bd 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -27,15 +27,6 @@ if serial --unit=0 --speed=115200; then
     terminal_output --append serial
 fi
 
-# Search for the ISO volume
-if [ -z "${ARCHISO_UUID}" ]; then
-    if [ -z "${ARCHISO_HINT}" ]; then
-        regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
-    fi
-    search --no-floppy --set=root --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}"
-    probe --set ARCHISO_UUID --fs-uuid "${root}"
-fi
-
 # Get a human readable platform identifier
 if [ "${grub_platform}" == 'efi' ]; then
     archiso_platform='UEFI'
@@ -62,7 +53,7 @@ timeout_style=menu
 
 menuentry "Arch Linux (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
     set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID}
+    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID%
     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
 }