aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2015-04-14 11:49:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:19:07 +0100
commitc9b06c79ed8a082d1b385e9f61721aeeda9bf1af (patch)
tree01f9db8692bb17590a7d06ae31f72c2f72c16381 /meta/recipes-core
parentfb45d5079235873c364639c43a15dcb56e075f14 (diff)
downloadopenembedded-core-contrib-c9b06c79ed8a082d1b385e9f61721aeeda9bf1af.tar.gz
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@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh6
1 files 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 89d0750b093..329586d74d0 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