[gentoo-commits] proj/genkernel:master commit in: defaults/

[Thomas Deutschmann]

commit:     fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 13:06:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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}"