From d21f3c0519a7251ab32344afd590b85018d56401 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 27 Nov 2018 04:33:54 -0500 Subject: Modify modules to include and load in GRUB images The cbfs module must be loaded before trying to source grub.cfg from CBFS, for obvious reasons. The test module is bundled into all images in order to avoid the situation where grub gets stuck in a loop trying to locate the module during parsing of grub.cfg. This could happen if a user removes the module or moves it, so it's best to avoid a brick by just bundling it into the image. For the bios target, biosdisk has been removed as it doesn't seem to provide any benefit and memdisk has been added to eliminate an error printed by GRUB upon load. --- projects/grub/configs/bios/config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'projects/grub/configs/bios/config') diff --git a/projects/grub/configs/bios/config b/projects/grub/configs/bios/config index 9e627e2f..c83bd21d 100644 --- a/projects/grub/configs/bios/config +++ b/projects/grub/configs/bios/config @@ -1,2 +1,4 @@ +insmod cbfs + set root=(cbfsdisk) source (cbfsdisk)/fallback/grub.cfg -- cgit v1.2.3-70-g09d2 From b30b54937e3d8f4933a7c87eae6e992841cbb78f Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 27 Nov 2018 04:46:37 -0500 Subject: Set prefix in GRUB BIOS image config --- projects/grub/configs/bios/config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'projects/grub/configs/bios/config') diff --git a/projects/grub/configs/bios/config b/projects/grub/configs/bios/config index c83bd21d..0b4a8d4e 100644 --- a/projects/grub/configs/bios/config +++ b/projects/grub/configs/bios/config @@ -1,4 +1,6 @@ insmod cbfs +set prefix=(cbfsdisk)/fallback + set root=(cbfsdisk) source (cbfsdisk)/fallback/grub.cfg -- cgit v1.2.3-70-g09d2