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

[Robin H. Johnson]

commit:     49aec4c7ace3c77f3fb86a4f5ae68c1c6beda1fa
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Jan  5 01:21:55 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=49aec4c7

login-remote.sh: only try to decrypt key using GPG if binary exists

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/login-remote.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7a1b21b..9b52037 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -78,7 +78,7 @@ openLUKSremote() {
                                        crypt_filter "cryptsetup 
${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} 
${LUKS_NAME}"
                                        crypt_filter_ret=$?
 
-                                       if [ ${crypt_filter_ret} -ne 0 ]
+                                       if [ -f /sbin/gpg ] && [ 
${crypt_filter_ret} -ne 0 ]
                                        then
                                                # 2nd try: gpg-encrypted keyfile
                                                [ -e /dev/tty ] && mv /dev/tty 
/dev/tty.org