From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1034301-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 6EE1D138334
	for <garchives@archives.gentoo.org>; Tue,  3 Jul 2018 01:33:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 582A7E09B7;
	Tue,  3 Jul 2018 01:33:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2C645E09B7
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jul 2018 01:33:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 37E3B335C97
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jul 2018 01:33:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id DED9F2E5
	for <gentoo-commits@lists.gentoo.org>; Tue,  3 Jul 2018 01:33:52 +0000 (UTC)
From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" <zerochaos@gentoo.org>
Message-ID: <1530581624.c7c2db9d5487d5a0c4e620c32d703f78951fd16b.zerochaos@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/create-iso.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Richard Farina
X-VCS-Revision: c7c2db9d5487d5a0c4e620c32d703f78951fd16b
X-VCS-Branch: master
Date: Tue,  3 Jul 2018 01:33:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3654de2e-6eb3-4bc9-83c4-d04f8de1c6d7
X-Archives-Hash: 796973e435873562f23e9c0769df7a26

commit:     c7c2db9d5487d5a0c4e620c32d703f78951fd16b
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 01:33:44 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 01:33:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c7c2db9d

bigger slack, catch issues

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

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 323179f5..2091d918 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -272,7 +272,7 @@ case ${clst_hostarch} in
 				# prepare gentoo.efimg from clst_target_path /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
+				iaSize=$((${iaSizeB}+64)) # add slack, tested near minimum for overhead
 				echo "Creating loopback file of size ${iaSize}kB"
 				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
@@ -286,7 +286,7 @@ case ${clst_hostarch} in
 
 				echo "Populating EFI image file from ${clst_target_path}/boot/EFI"
 				cp -rv "${clst_target_path}"/boot/EFI/ \
-					"${clst_target_path}/gentoo.efimg.mountPoint"
+					"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to populate EFI image file"
 
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"
 				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"