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

[Robin H. Johnson]

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

login-remote.sh: unnest second LUKS decryption try

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

 defaults/login-remote.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 9b52037..a7bba43 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -77,20 +77,20 @@ openLUKSremote() {
                                        # 1st try: unencrypted keyfile
                                        crypt_filter "cryptsetup 
${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} 
${LUKS_NAME}"
                                        crypt_filter_ret=$?
+                               fi
 
-                                       if [ -f /sbin/gpg ] && [ 
${crypt_filter_ret} -ne 0 ]
-                                       then
-                                               # 2nd try: gpg-encrypted keyfile
-                                               [ -e /dev/tty ] && mv /dev/tty 
/dev/tty.org
-                                               mknod /dev/tty c 5 1
-                                               gpg_cmd="/sbin/gpg 
--logger-file /dev/null --quiet --decrypt ${LUKS_KEY} |"
-                                               crypt_filter 
"${gpg_cmd}cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen 
${LUKS_DEVICE} ${LUKS_NAME}"
-                                               crypt_filter_ret=$?
+                               if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} 
-ne 0 ]
+                               then
+                                       # 2nd try: gpg-encrypted keyfile
+                                       [ -e /dev/tty ] && mv /dev/tty 
/dev/tty.org
+                                       mknod /dev/tty c 5 1
+                                       gpg_cmd="/sbin/gpg --logger-file 
/dev/null --quiet --decrypt ${LUKS_KEY} |"
+                                       crypt_filter "${gpg_cmd}cryptsetup 
${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} 
${LUKS_NAME}"
+                                       crypt_filter_ret=$?
 
-                                               [ -e /dev/tty.org ] \
-                                                       && rm -f /dev/tty \
-                                                       && mv /dev/tty.org 
/dev/tty
-                                       fi
+                                       [ -e /dev/tty.org ] \
+                                               && rm -f /dev/tty \
+                                               && mv /dev/tty.org /dev/tty
                                fi
 
                                if [ ${crypt_filter_ret} -eq 0 ]