public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 3/5] targets: Move isoroot verify check into isoroot_checksum()
Date: Tue,  7 Apr 2020 20:27:51 -0700	[thread overview]
Message-ID: <20200408032753.105267-3-mattst88@gentoo.org> (raw)
In-Reply-To: <20200408032753.105267-1-mattst88@gentoo.org>

This will simplify the callers.

Signed-off-by: Matt Turner <mattst88@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"
-- 
2.24.1



  parent reply	other threads:[~2020-04-08  3:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08  3:27 [gentoo-catalyst] [PATCH 1/5] targets: Drop SHA512 isoroot verification support Matt Turner
2020-04-08  3:27 ` [gentoo-catalyst] [PATCH 2/5] targets: Simplify isoroot_checksum() Matt Turner
2020-04-08  3:27 ` Matt Turner [this message]
2020-04-08  3:27 ` [gentoo-catalyst] [PATCH 4/5] targets: Support isoroot checksum on more platforms Matt Turner
2020-04-08  3:27 ` [gentoo-catalyst] [PATCH 5/5] targets: Use GRUB for BIOS boot Matt Turner
2020-04-08 16:13 ` [gentoo-catalyst] [PATCH 1/5] targets: Drop SHA512 isoroot verification support Brian Dolbec
2020-04-08 17:51   ` Matt Turner
2020-04-08 18:40     ` Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200408032753.105267-3-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox