mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #575 from marineam/grub

Browse Source 
grub: abort boot if gptprio fails
This commit is contained in:
Michael Marineau 2016-08-10 17:38:22 -07:00 committed by GitHub
commit b94a16253a
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build_library/grub.cfg
View File

@ -107,13 +107,37 @@ fi
# Assemble the options applicable to all the kernels below
set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $oem_id $linux_append"
menuentry "CoreOS default" --id=coreos {
gptprio.next -d usr -u usr_uuid
if [ "$usr_uuid" = "7130c94a-213a-4e5a-8e26-6cce9662f132" ]; then
linux$suf /coreos/vmlinuz-a @@MOUNTUSR@@=PARTUUID=$usr_uuid $linux_cmdline
else
linux$suf /coreos/vmlinuz-b @@MOUNTUSR@@=PARTUUID=$usr_uuid $linux_cmdline
# Re-implement grub_abort() since no command exposes it.
function abort {
echo
echo "Aborted. Press enter to exit GRUB."
read anything
exit
}
# Select the kernel and usr partition to boot.
function gptprio {
# TODO: device name is no longer needed, should make it optional...
gptprio.next -d usr_device -u usr_uuid
if [ $? -ne 0 -o -z "$usr_uuid" ]; then
echo
echo "Reading or updating the GPT failed!"
echo "Please file a bug with any messages above to CoreOS:"
echo " https://github.com/coreos/bugs/issues"
abort
fi
set gptprio_cmdline="@@MOUNTUSR@@=PARTUUID=$usr_uuid"
if [ "$usr_uuid" = "7130c94a-213a-4e5a-8e26-6cce9662f132" ]; then
set gptprio_kernel="/coreos/vmlinuz-a"
else
set gptprio_kernel="/coreos/vmlinuz-b"
fi
}
menuentry "CoreOS default" --id=coreos {
gptprio
linux$suf $gptprio_kernel $gptprio_cmdline $linux_cmdline
}
menuentry "CoreOS USR-A" --id=coreos-a {

2
build_library/grub_install.sh
View File

@ -39,7 +39,7 @@ GRUB_DIR="coreos/grub/${FLAGS_target}"
GRUB_SRC="/usr/lib/grub/${FLAGS_target}"
# 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 )
CORE_MODULES=( normal search test fat part_gpt search_fs_uuid gzio search_part_label terminal gptprio configfile memdisk tar echo read )
# Name of the core image, depends on target
CORE_NAME=