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 C1721138350 for ; Wed, 8 Apr 2020 03:28:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CDE4E09AE; Wed, 8 Apr 2020 03:28:18 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) (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 055E9E09AE for ; Wed, 8 Apr 2020 03:28:17 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id n13so1276904pgp.11 for ; Tue, 07 Apr 2020 20:28:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5RP5A1jPUKcqFojwpXMZpfYIRLm6ic5SlmoePR4qHjs=; b=sOvVVT8BGNFMRnS2IyZC1Cx5z/S/bi2+8ht0VjTjVZRI5TtUkjJbIIomseX+5lQ0H2 AunOUi7XtHZCyuNu1VwgGUQ2pEI1xPYyFdCYJN0uV+Az9Wgp3yTBLE4u/073nif/JOpl nBPdyfBaxOZ1dId1scwitpV0cVyP9sgO96GVl9zXZYE0znoTa2v0O/ysFnofdg3rA9j3 c0jQOEpyBFmPiwXfFtmGaPEPMIpn2kHxCSX75ixlAf0NqUz9i5RqmOx4NhHOILgUWsIG i1R0bxBWezwca2uYMd2ls88503DxYw5FvFISpAvz6QjgJTqAv8OIwtnP2T3l9gJCjQnl umag== X-Gm-Message-State: AGi0PuYMJ2+XNOE6Gv+YBSfmZd0SOcUWqbyWAG/NzPYAzrWzG2AZJQt0 uRLhrGidYuh9ozHUA5IJNetp2wr6 X-Google-Smtp-Source: APiQypJI5EQ4SvpXNL/PxWnjDVt7ZWySYULRPYveyOStQamciU/+qxplaumiSHSIOWrWcum0UJLjqg== X-Received: by 2002:a63:6246:: with SMTP id w67mr5233699pgb.212.1586316496519; Tue, 07 Apr 2020 20:28:16 -0700 (PDT) Received: from localhost ([134.134.137.79]) by smtp.gmail.com with ESMTPSA id e80sm15761109pfh.117.2020.04.07.20.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 20:28:15 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 3/5] targets: Move isoroot verify check into isoroot_checksum() Date: Tue, 7 Apr 2020 20:27:51 -0700 Message-Id: <20200408032753.105267-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200408032753.105267-1-mattst88@gentoo.org> References: <20200408032753.105267-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 21848389-4cff-41db-8205-a2b3b2cca95c X-Archives-Hash: bedf52cc78e4136a80133a0870547e03 This will simplify the callers. Signed-off-by: Matt Turner --- 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" -- 2.24.1