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 9201D138350 for ; Fri, 14 Feb 2020 16:35:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F473E0867; Fri, 14 Feb 2020 16:35:08 +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 0FF10E0867 for ; Fri, 14 Feb 2020 16:35:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C9A0634ECFD for ; Fri, 14 Feb 2020 16:35:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46E5DAF for ; Fri, 14 Feb 2020 16:35:05 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1581697401.5c55dd467a563623f16be27f670b5a3ddc79fb02.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 5c55dd467a563623f16be27f670b5a3ddc79fb02 X-VCS-Branch: master Date: Fri, 14 Feb 2020 16:35:05 +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: 256b6b3e-12af-4541-9cec-0dee105d558d X-Archives-Hash: 0104489509d06846c2ae086b219fc678 commit: 5c55dd467a563623f16be27f670b5a3ddc79fb02 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Fri Feb 14 16:23:21 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Feb 14 16:23:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c55dd46 verify support for blake2 Signed-off-by: Rick Farina (Zero_Chaos) gentoo.org> defaults/initrd.scripts | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 6c7d72b..3ea80ee 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -318,20 +318,33 @@ bootstrapCD() { if [ "${VERIFY}" = '1' ] then cd "${CDROOT_PATH}" - if [ -f isoroot_checksums ] + if [ -r "isoroot_b2sums" ] && [ -x "$(command -v b2sum 2>&1)" ] then - good_msg "Verifying checksums, this may take some time ..." + good_msg "Verifying BLAKE2 checksums, this may take some time ..." + if ! run b2sum -c isoroot_b2sums + then + bad_msg "Some checksums failed, press any key to poweroff ..." + read -n1 -s + poweroff -f + else + good_msg "BLAKE2 checksums all valid, continuing boot ..." + fi + cd "${OLDPWD}" + elif [ -r "isoroot_checksums" ] + then + good_msg "Verifying SHA512 checksums, this may take some time ..." if ! run sha512sum -c isoroot_checksums then bad_msg "Some checksums failed, press any key to poweroff ..." read -n1 -s poweroff -f else - good_msg "Checksums all valid, continuing boot ..." + good_msg "SHA512 checksums all valid, continuing boot ..." fi cd "${OLDPWD}" else - bad_msg "Verify enabled but no checksums file exists, skipping" + bad_msg "Verify requested but no checksums file exists, press any key to skip ..." + read -n1 -s fi fi }