[gentoo-commits] proj/catalyst:master commit in: targets/support/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     8a70e1ec82d1dbe29b8edf69514a5073ecc1ed71
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 14:12:40 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 14:12:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8a70e1ec

create-iso.sh: copy EFI files onto iso root for vfat/usb compatibility

Tools like rufus & unetbootin will take our iso9660 FS contents &
put them onto a device with real (msdos or gpt) partitions and a vfat
filesystem.  For EFI boot, this means the new FS must contain the EFI
boot images.  The ones we have embedded into the iso (el torito) boot
sector will be lost.

This commit makes sure /EFI is available on the iso image root, so that
it's usable for EFI boot after vfat conversion.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/create-iso.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 1637c2ea..253a8887 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -274,7 +274,10 @@ case ${clst_hostarch} in
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"
 				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
 
-				echo "Removing /boot contents"
+				echo "Copying /boot/EFI to /EFI for rufus compatability"
+				cp -rv "${clst_target_path}"/boot/EFI/ "${clst_target_path}"
+
+				echo "Emptying /boot"
 				rm -rf "${clst_target_path}"/boot
 				mkdir -p "${clst_target_path}"/boot
 			fi