Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
Date: Fri, 01 Mar 2019 06:00:25
Message-Id: 1551419941.49aec4c7ace3c77f3fb86a4f5ae68c1c6beda1fa.robbat2@gentoo
1 commit: 49aec4c7ace3c77f3fb86a4f5ae68c1c6beda1fa
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 5 01:21:55 2019 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 1 05:59:01 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=49aec4c7
7
8 login-remote.sh: only try to decrypt key using GPG if binary exists
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 defaults/login-remote.sh | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
16 index 7a1b21b..9b52037 100644
17 --- a/defaults/login-remote.sh
18 +++ b/defaults/login-remote.sh
19 @@ -78,7 +78,7 @@ openLUKSremote() {
20 crypt_filter "cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
21 crypt_filter_ret=$?
22
23 - if [ ${crypt_filter_ret} -ne 0 ]
24 + if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ]
25 then
26 # 2nd try: gpg-encrypted keyfile
27 [ -e /dev/tty ] && mv /dev/tty /dev/tty.org