[oe-commits] Reinette Chatre : init-install-efi.sh: fix gummiboot entry installation
git at git.openembedded.org
git at git.openembedded.org
Tue Apr 21 06:21:19 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: c9b06c79ed8a082d1b385e9f61721aeeda9bf1af
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c9b06c79ed8a082d1b385e9f61721aeeda9bf1af
Author: Reinette Chatre <reinette.chatre at intel.com>
Date: Tue Apr 14 11:49:37 2015 -0700
init-install-efi.sh: fix gummiboot entry installation
After selecting the "install" gummiboot option of a Live image we are
seeing boot failure resulting from the gummiboot entries not being
installed correctly. This seems to be a problem in this init-install-efi.sh
script where it incorrectly installs the gummiboot entries into the root
filesystem, not the boot partition. We fix it by installing the entries in
the boot partition.
Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
Acked-by: Darren Hart <dvhart at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 89d0750..329586d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -199,11 +199,11 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
fi
if [ -d /run/media/$1/loader ]; then
- GUMMIBOOT_CFGS="/tgt_root/loader/entries/*.conf"
+ GUMMIBOOT_CFGS="/boot/loader/entries/*.conf"
# copy config files for gummiboot
- cp -dr /run/media/$1/loader /tgt_root
+ cp -dr /run/media/$1/loader /boot
# delete the install entry
- rm -f /tgt_root/loader/entries/install.conf
+ rm -f /boot/loader/entries/install.conf
# delete the initrd lines
sed -i "/initrd /d" $GUMMIBOOT_CFGS
# delete any LABEL= strings
More information about the Openembedded-commits
mailing list