aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-09-02 15:06:21 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-09-02 15:06:21 +0200
commitfbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2 (patch)
tree8cde3126b6097aed59d135ce3e4dea792b5fcd2f
parentgen_funcs.sh: check_disk_space_requirements(): Force LC_ALL=C (diff)
downloadgenkernel-fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2.tar.gz
genkernel-fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2.tar.bz2
genkernel-fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2.zip
defaults/initrd.defaults: Rename $CRYPT_KEYFILE_{ROOT,SWAP} -> $CRYPT_{ROOT,SWAP}_KEYFILE
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--defaults/initrd.defaults4
-rw-r--r--defaults/login-remote.sh4
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}"