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

cleanup-cruft
Sebastian Pipping 13 years ago
parent 46318550cd
commit 23a40aeb0e

@ -5,6 +5,10 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $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: 22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.27 Bump version to 3.4.27

@ -880,7 +880,13 @@ openLUKS() {
fi fi
# At this point, keyfile or not, we're ready! # At this point, keyfile or not, we're ready!
crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" 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 then
good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT} good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
break break

Loading…
Cancel
Save