From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6234F138350 for ; Fri, 17 Apr 2020 19:57:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99448E086D; Fri, 17 Apr 2020 19:57:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 82EB4E086D for ; Fri, 17 Apr 2020 19:57:32 +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 9D77534F146 for ; Fri, 17 Apr 2020 19:57:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 516EA71 for ; Fri, 17 Apr 2020 19:57:30 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1587153439.25c158df771eecadefc0d1cb591938780a8cbf4d.bkohler@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: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 25c158df771eecadefc0d1cb591938780a8cbf4d X-VCS-Branch: master Date: Fri, 17 Apr 2020 19:57:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba3b6e61-5084-470d-895a-21ade7586ab1 X-Archives-Hash: 82fd606673cd16bb86bef9102389c191 commit: 25c158df771eecadefc0d1cb591938780a8cbf4d Author: Ben Kohler gentoo org> AuthorDate: Fri Apr 17 19:56:16 2020 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Apr 17 19:57:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=25c158df create-iso.sh: actually fix du ESP size calculation on x86/amd64 Signed-off-by: Ben Kohler gentoo.org> targets/support/create-iso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 793ed606..01b06501 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -220,7 +220,7 @@ case ${clst_hostarch} in mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI" fi # prepare gentoo.efimg from clst_target_path /boot/EFI dir - iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null) + iaSizeTemp=$(du -sk --apparent-size "${clst_target_path}/boot/EFI" 2>/dev/null) iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1) iaSize=$((${iaSizeB}+64)) # add slack, tested near minimum for overhead echo "Creating loopback file of size ${iaSize}kB"