From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 29 Mar 2012 17:46:26 +0000 (+0200)
Subject: Restore original /dev/tty after GPG (bug #410073)
X-Git-Tag: v3.4.28~2^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23a40aeb0ee2a46420fe0186b3d822078757fc01;p=genkernel.git

Restore original /dev/tty after GPG (bug #410073)
---

diff --git a/ChangeLog b/ChangeLog
index e8e73d9..a1a3aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  29 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Restore original /dev/tty after GPG (bug #410073), report and initial patch
+  by Brendan Pike
+
   22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.27
 
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 296b150..4e0e123 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -880,7 +880,13 @@ openLUKS() {
 				fi
 				# At this point, keyfile or not, we're ready!
 				crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
-				if [ $? -eq 0 ]
+				crypt_filter_ret=$?
+
+				[ -e /dev/tty.org ] \
+					&& rm -f /dev/tty \
+					&& mv /dev/tty.org /dev/tty
+
+				if [ ${crypt_filter_ret} -eq 0 ]
 				then
 					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
 					break