Merge pull request #1954 from flatcar/jepio/grub-cfg-tweaks

grub cfg tweaks
This commit is contained in:
Jeremi Piotrowski 2024-04-25 12:21:17 +02:00 committed by GitHub
commit 9169dfd9f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -43,7 +43,7 @@ GRUB_DIR="flatcar/grub/${FLAGS_target}"
GRUB_SRC="/usr/lib/grub/${FLAGS_target}" GRUB_SRC="/usr/lib/grub/${FLAGS_target}"
# Modules required to boot a standard CoreOS configuration # Modules required to boot a standard CoreOS configuration
CORE_MODULES=( normal search test fat part_gpt search_fs_uuid gzio search_part_label terminal gptprio configfile memdisk tar echo read ) CORE_MODULES=( normal search test fat part_gpt search_fs_uuid gzio search_part_label terminal gptprio configfile memdisk tar echo read btrfs )
# Name of the core image, depends on target # Name of the core image, depends on target
CORE_NAME= CORE_NAME=
@ -141,10 +141,11 @@ done
info "Generating ${GRUB_DIR}/load.cfg" info "Generating ${GRUB_DIR}/load.cfg"
# Include a small initial config in the core image to search for the ESP # Include a small initial config in the core image to search for the ESP
# by filesystem ID in case the platform doesn't provide the boot disk. # by filesystem ID in case the platform doesn't provide the boot disk.
# The existing $root value is given as a hint so it is searched first. # $root points to memdisk here so instead use hd0,gpt1 as a hint so it is
# searched first.
ESP_FSID=$(sudo grub-probe -t fs_uuid -d "${LOOP_DEV}p1") ESP_FSID=$(sudo grub-probe -t fs_uuid -d "${LOOP_DEV}p1")
sudo_clobber "${ESP_DIR}/${GRUB_DIR}/load.cfg" <<EOF sudo_clobber "${ESP_DIR}/${GRUB_DIR}/load.cfg" <<EOF
search.fs_uuid ${ESP_FSID} root \$root search.fs_uuid ${ESP_FSID} root hd0,gpt1
set prefix=(memdisk) set prefix=(memdisk)
set set
EOF EOF