summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArindam Nath <arindam.nath@amd.com>2014-10-17 10:08:08 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:36:15 +0100
commitc981ebba29001b8684e9805515576c2350a4e22b (patch)
treee65804abdd6ecc8f133d942150c5e9dba46875be
parentf348071efd9419de3fa7f4e4ad78dfa5f8445412 (diff)
downloadpoky-c981ebba29001b8684e9805515576c2350a4e22b.tar.gz
poky-c981ebba29001b8684e9805515576c2350a4e22b.tar.bz2
poky-c981ebba29001b8684e9805515576c2350a4e22b.zip
grub: add cmdpath to grub configuration file
An issue was found where when yocto is installed to a hard disk from a live USB key, no matter what boot order was selected in the BIOS menu, the grub menu of the USB key would always show up. The issue was narrowed down to the way grub configuration file gets embedded into the standalone bootx64.efi image. The commit prepends ($cmdpath) to the search path for grub.cfg, thus making sure the UEFI environment itself sets this to the correct device path. This in-turn lets the grub.cfg of the boot device to be loaded. (From OE-Core rev: 5ce73b6055ac5a47906e2e661bc5163604f5cec9) Signed-off-by: Arindam Nath <arindam.nath@amd.com> Reviewed-by: Drew Moseley <drew_moseley@mentor.com> Tested-by: Ravikiran Polepalli <Ravikiran_Polepalli@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/files/cfg b/meta/recipes-bsp/grub/files/cfg
index ffffe47638..8ca53d24d7 100644
--- a/meta/recipes-bsp/grub/files/cfg
+++ b/meta/recipes-bsp/grub/files/cfg
@@ -1,2 +1,2 @@
-search.file /EFI/BOOT/grub.cfg root
+search.file ($cmdpath)/EFI/BOOT/grub.cfg root
set prefix=($root)/EFI/BOOT