[patch] 02-no-bundle-kernel-in-efibootimg.patch

02-no-bundle-kernel-in-efibootimg.patch (text/plain), 1.50 KB, created by Ben Kohler on 2018-01-04 16:05:22 UTC

From b0a294920ae3033632bb0a4d94c555bc6802526a Mon Sep 17 00:00:00 2001
From: Ben Kohler <[e-mail]>
Date: Tue, 19 Sep 2017 09:10:51 -0500
Subject: [PATCH] create-iso.sh: stop bundling kernel/initramfs in EFI boot
 image

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

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index e53d31a..5cf12e7 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -261,8 +261,8 @@ case ${clst_hostarch} in
 				mkdir -p "${clst_target_path}"/boot
 			else
 				echo "Preparing EFI boot image"
-				# prepare gentoo.efimg from cdtar's /boot dir 
-				iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
+				# prepare gentoo.efimg from cdtar's /boot/EFI dir 
+				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+32)) # Add slack
 				echo "Creating loopback file of size ${iaSize}kB"
@@ -276,8 +276,8 @@ case ${clst_hostarch} in
 				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
-				echo "Populating EFI image file from ${clst_target_path}/boot"
-				cp -rv "${clst_target_path}"/boot/* \
+				echo "Populating EFI image file from ${clst_target_path}/boot/EFI"
+				cp -rv "${clst_target_path}"/boot/EFI/ \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"