Johannes
/
ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs/*/grub/grub.cfg: reuse ARCHISO_HINT and ARCHISO_UUID passed from the embedded grub.cfg 

The `grub.cfg` embedded in the GRUB binaries already sets `ARCHISO_HINT`
and `ARCHISO_UUID` in most cases. To avoid performing the same searches
multiple times, use the existing variables.
This commit is contained in:
nl6720 2023-01-28 14:04:15 +02:00
parent 46b87073f0
commit b68ced4460
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grub/grub.cfg
View File

@ -25,9 +25,13 @@ if serial --unit=0 --speed=115200; then
fi
# Search for the ISO volume
regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
search --no-floppy --set=root --file '/.disk/%UUID_SEARCH_FILENAME%.uuid' --hint "${ARCHISO_HINT}"
probe --set ARCHISO_UUID --fs-uuid "${root}"
if [ -z "${ARCHISO_UUID}" ]; then
if [ -z "${ARCHISO_HINT}" ]; then
regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
fi
search --no-floppy --set=root --file '/.disk/%UUID_SEARCH_FILENAME%.uuid' --hint "${ARCHISO_HINT}"
probe --set ARCHISO_UUID --fs-uuid "${root}"
fi
# Set default menu entry
default=archlinux