From fc15878af46c09512fc3cb73480359fcbb22e627 Mon Sep 17 00:00:00 2001 From: Reinette Chatre Date: Tue, 14 Apr 2015 11:49:37 -0700 Subject: 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. (From OE-Core rev: c9b06c79ed8a082d1b385e9f61721aeeda9bf1af) Signed-off-by: Reinette Chatre Acked-by: Darren Hart Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initrdscripts') diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 89d0750b09..329586d74d 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 -- cgit v1.2.3-54-g00ecf