| 1 |
commit: 05f7b1ab0e7e474358e4da2e0cee6f12f06a1f20 |
| 2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 5 01:16:34 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 1 05:59:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=05f7b1ab |
| 7 |
|
| 8 |
login-remote.sh: unnest second LUKS decryption try |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
defaults/login-remote.sh | 24 ++++++++++++------------ |
| 13 |
1 file changed, 12 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh |
| 16 |
index 9b52037..a7bba43 100644 |
| 17 |
--- a/defaults/login-remote.sh |
| 18 |
+++ b/defaults/login-remote.sh |
| 19 |
@@ -77,20 +77,20 @@ openLUKSremote() { |
| 20 |
# 1st try: unencrypted keyfile |
| 21 |
crypt_filter "cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" |
| 22 |
crypt_filter_ret=$? |
| 23 |
+ fi |
| 24 |
|
| 25 |
- if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ] |
| 26 |
- then |
| 27 |
- # 2nd try: gpg-encrypted keyfile |
| 28 |
- [ -e /dev/tty ] && mv /dev/tty /dev/tty.org |
| 29 |
- mknod /dev/tty c 5 1 |
| 30 |
- gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${LUKS_KEY} |" |
| 31 |
- crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" |
| 32 |
- crypt_filter_ret=$? |
| 33 |
+ if [ -f /sbin/gpg ] && [ ${crypt_filter_ret} -ne 0 ] |
| 34 |
+ then |
| 35 |
+ # 2nd try: gpg-encrypted keyfile |
| 36 |
+ [ -e /dev/tty ] && mv /dev/tty /dev/tty.org |
| 37 |
+ mknod /dev/tty c 5 1 |
| 38 |
+ gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${LUKS_KEY} |" |
| 39 |
+ crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} --key-file ${LUKS_KEY} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" |
| 40 |
+ crypt_filter_ret=$? |
| 41 |
|
| 42 |
- [ -e /dev/tty.org ] \ |
| 43 |
- && rm -f /dev/tty \ |
| 44 |
- && mv /dev/tty.org /dev/tty |
| 45 |
- fi |
| 46 |
+ [ -e /dev/tty.org ] \ |
| 47 |
+ && rm -f /dev/tty \ |
| 48 |
+ && mv /dev/tty.org /dev/tty |
| 49 |
fi |
| 50 |
|
| 51 |
if [ ${crypt_filter_ret} -eq 0 ] |
Archives