diff options
| author |   Reinette Chatre <reinette.chatre@intel.com> | 2015-04-14 11:49:37 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:12:08 +0100 |
| commit | 5d38c46689c9065992838b58e280886f4091f8fd (patch) | |
| tree | 8b66614a465d36caf9dee018400fd2baaa67e127 /meta/recipes-core | |
| parent | 27bf71420b535678640f8edd0c6bc551bd322f1c (diff) | |
| download | openembedded-core-contrib-5d38c46689c9065992838b58e280886f4091f8fd.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.
(From OE-Core master rev: c9b06c79ed8a082d1b385e9f61721aeeda9bf1af)
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.sh | 6 |
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 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 |