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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B56B0158090 for ; Sun, 29 May 2022 16:52:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 719D9E08C3; Sun, 29 May 2022 16:52:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55EDFE08C3 for ; Sun, 29 May 2022 16:52:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 550AF3419C0 for ; Sun, 29 May 2022 16:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B0A6D3 for ; Sun, 29 May 2022 16:52:46 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1653773081.2f5a7fc596bdf919f41ddc5df063abf109af6758.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2f5a7fc596bdf919f41ddc5df063abf109af6758 X-VCS-Branch: master Date: Sun, 29 May 2022 16:52:46 +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: c273cfe5-578b-42d4-b576-490c7f55718b X-Archives-Hash: ecdb64ad08f20c7b1fa4d4f4b13f0853 commit: 2f5a7fc596bdf919f41ddc5df063abf109af6758 Author: FlyingWaffle pm me> AuthorDate: Sat May 28 21:24:41 2022 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 28 21:24:41 2022 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f5a7fc5 Fixes a mistake with quotation usage when testing for LVM flag. Signed-off-by: FlyingWaffle pm.me> defaults/linuxrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index 9daad4a..2f94eb4 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -672,7 +672,7 @@ if [ "${CDROOT}" != '1' ] then if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \ ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] ) || \ - ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1 ] ) + ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ "${USE_LVM_NORMAL}" = '1' ] ) then # the swap key or header might be on the root fs so start it first in this case start_LUKS_root