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 9C23E138359 for ; Wed, 2 Sep 2020 13:52:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A986BE08F0; Wed, 2 Sep 2020 13:52:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7200AE08EB for ; Wed, 2 Sep 2020 13:52:39 +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 08E9833BF43 for ; Wed, 2 Sep 2020 13:52:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81B9C335 for ; Wed, 2 Sep 2020 13:52:36 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1599051981.fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.defaults defaults/login-remote.sh X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2 X-VCS-Branch: master Date: Wed, 2 Sep 2020 13:52:36 +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: af2d0c2e-233b-44c8-8c1c-17e6d1648836 X-Archives-Hash: 95f29347024a40fc90351fed11b01e97 commit: fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 2 13:06:21 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 2 13:06:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fbf7eb4e defaults/initrd.defaults: Rename $CRYPT_KEYFILE_{ROOT,SWAP} -> $CRYPT_{ROOT,SWAP}_KEYFILE Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.defaults | 4 ++-- defaults/login-remote.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index b665355..cf7406d 100644 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -101,9 +101,9 @@ GK_UDEV_TIMEOUT=120 GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled' CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf' -CRYPT_KEYFILE_ROOT='/tmp/root.key' -CRYPT_KEYFILE_SWAP='/tmp/swap.key' +CRYPT_ROOT_KEYFILE='/tmp/root.key' CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened' +CRYPT_SWAP_KEYFILE='/tmp/swap.key' CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened' ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf' diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh index 94ee014..7fcfc70 100644 --- a/defaults/login-remote.sh +++ b/defaults/login-remote.sh @@ -24,10 +24,10 @@ fi receivefile() { case ${1} in root) - file=${CRYPT_KEYFILE_ROOT} + file=${CRYPT_ROOT_KEYFILE} ;; swap) - file=${CRYPT_KEYFILE_SWAP} + file=${CRYPT_SWAP_KEYFILE} ;; '') bad_msg "No keyfile specified." "${CRYPT_SILENT}"