diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2015-04-14 11:49:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-21 07:20:27 +0100 |
commit | fc15878af46c09512fc3cb73480359fcbb22e627 (patch) | |
tree | 53eac17fe088c11af3e7de6e5d944b2d8296db29 /meta | |
parent | 6467ad468a10a4cc221ec62373ff2cd919aedcd6 (diff) | |
download | poky-fc15878af46c09512fc3cb73480359fcbb22e627.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 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')
-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 | |||
199 | fi | 199 | fi |
200 | 200 | ||
201 | if [ -d /run/media/$1/loader ]; then | 201 | if [ -d /run/media/$1/loader ]; then |
202 | GUMMIBOOT_CFGS="/tgt_root/loader/entries/*.conf" | 202 | GUMMIBOOT_CFGS="/boot/loader/entries/*.conf" |
203 | # copy config files for gummiboot | 203 | # copy config files for gummiboot |
204 | cp -dr /run/media/$1/loader /tgt_root | 204 | cp -dr /run/media/$1/loader /boot |
205 | # delete the install entry | 205 | # delete the install entry |
206 | rm -f /tgt_root/loader/entries/install.conf | 206 | rm -f /boot/loader/entries/install.conf |
207 | # delete the initrd lines | 207 | # delete the initrd lines |
208 | sed -i "/initrd /d" $GUMMIBOOT_CFGS | 208 | sed -i "/initrd /d" $GUMMIBOOT_CFGS |
209 | # delete any LABEL= strings | 209 | # delete any LABEL= strings |