faerbit/archiso
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

Browse Source 
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 b94d7c4ce5
commit f7502001b0
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/baseline/grub/grub.cfg
View File

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

10
configs/releng/grub/grub.cfg
View File

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