commit: 3a1a48c7d9d5bbaad0466be572661fc08458edb0
Author: Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Mon Mar 5 20:36:43 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar 5 20:36:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a1a48c7
create-iso.sh: don't add kernel to efi boot image
With GRUB2 bootloader, the kernel can be read from the ISO filesystem,
so having a copy of kernel+initramfs in the EFI boot image is redundant.
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 5e760e14..2c40f713 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -269,8 +269,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"
@@ -284,8 +284,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"
