Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
Date: Wed, 02 Sep 2020 13:52:40
Message-Id: 1599051981.fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2.whissi@gentoo
1 commit: fbf7eb4eda41bc8b5afa30017e687f5eb28ec0f2
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 13:06:21 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 13:06:21 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fbf7eb4e
7
8 defaults/initrd.defaults: Rename $CRYPT_KEYFILE_{ROOT,SWAP} -> $CRYPT_{ROOT,SWAP}_KEYFILE
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 defaults/initrd.defaults | 4 ++--
13 defaults/login-remote.sh | 4 ++--
14 2 files changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
17 index b665355..cf7406d 100644
18 --- a/defaults/initrd.defaults
19 +++ b/defaults/initrd.defaults
20 @@ -101,9 +101,9 @@ GK_UDEV_TIMEOUT=120
21 GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
22
23 CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf'
24 -CRYPT_KEYFILE_ROOT='/tmp/root.key'
25 -CRYPT_KEYFILE_SWAP='/tmp/swap.key'
26 +CRYPT_ROOT_KEYFILE='/tmp/root.key'
27 CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened'
28 +CRYPT_SWAP_KEYFILE='/tmp/swap.key'
29 CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened'
30
31 ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf'
32
33 diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
34 index 94ee014..7fcfc70 100644
35 --- a/defaults/login-remote.sh
36 +++ b/defaults/login-remote.sh
37 @@ -24,10 +24,10 @@ fi
38 receivefile() {
39 case ${1} in
40 root)
41 - file=${CRYPT_KEYFILE_ROOT}
42 + file=${CRYPT_ROOT_KEYFILE}
43 ;;
44 swap)
45 - file=${CRYPT_KEYFILE_SWAP}
46 + file=${CRYPT_SWAP_KEYFILE}
47 ;;
48 '')
49 bad_msg "No keyfile specified." "${CRYPT_SILENT}"