Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Mon, 02 Jul 2018 18:55:06
Message-Id: 1530557648.2b684f7d8cb5281867cce1f53ebb22e9f687dcce.zerochaos@gentoo
1 commit: 2b684f7d8cb5281867cce1f53ebb22e9f687dcce
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 2 18:54:08 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 2 18:54:08 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2b684f7d
7
8 add more slack and catch error
9
10 I have no idea why we are running out of space in the efi boot image,
11 but for right now I'm just going to detect the failure and blindly add
12 more slack.
13
14 targets/support/create-iso.sh | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
18 index 607a89aa..323179f5 100755
19 --- a/targets/support/create-iso.sh
20 +++ b/targets/support/create-iso.sh
21 @@ -124,7 +124,7 @@ case ${clst_hostarch} in
22 then
23 iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
24 iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
25 - iaSize=$((${iaSizeB}+32)) # Add slack
26 + iaSize=$((${iaSizeB}+64)) # Add slack
27
28 dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
29 count=${iaSize}
30 @@ -136,7 +136,7 @@ case ${clst_hostarch} in
31
32 echo '>> Populating EFI image...'
33 cp -rv "${clst_target_path}"/boot/* \
34 - "${clst_target_path}/gentoo.efimg.mountPoint"
35 + "${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to populate EFI image"
36
37 umount "${clst_target_path}/gentoo.efimg.mountPoint"
38 rmdir "${clst_target_path}/gentoo.efimg.mountPoint"