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 2E72B138351 for ; Fri, 10 Apr 2020 02:11:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A8C9E08A2; Fri, 10 Apr 2020 02:11: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 2313DE08A2 for ; Fri, 10 Apr 2020 02:11: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 C9AF334EFC9 for ; Fri, 10 Apr 2020 02:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 966621D4 for ; Fri, 10 Apr 2020 02:11:28 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586460223.77d740ccdb80cbe368e0bf6169298670cbe811a9.mattst88@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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 77d740ccdb80cbe368e0bf6169298670cbe811a9 X-VCS-Branch: master Date: Fri, 10 Apr 2020 02:11:28 +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: b3ee4cf3-21d3-4953-8428-746d3c168710 X-Archives-Hash: e127b1ce20e052d006ec12550b03956e commit: 77d740ccdb80cbe368e0bf6169298670cbe811a9 Author: Matt Turner gentoo org> AuthorDate: Wed Apr 8 01:50:57 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 9 19:23:43 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=77d740cc targets: Move isoroot verify check into isoroot_checksum() This will simplify the callers. Signed-off-by: Matt Turner gentoo.org> targets/support/create-iso.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 8c0da181..b32c669e 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -97,6 +97,8 @@ fi # Generate list of checksums that genkernel can use to verify the contents of # the ISO isoroot_checksum() { + [ -z "${clst_livecd_verify}" ] && return + echo ">> Creating checksums for all files included in the ISO" pushd "${clst_target_path}" @@ -107,7 +109,7 @@ isoroot_checksum() { } run_mkisofs() { - [ -n "${clst_livecd_verify}" ] && isoroot_checksum + isoroot_checksum echo "Running \"mkisofs ${@}\"" mkisofs "${@}" || die "Cannot make ISO image"