From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sat, 20 Feb 2010 02:20:16 +0000 (-0600)
Subject: Apply patches from Gentoo bug #268468
X-Git-Tag: v3.4.10.908~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3e0797d42ff2e0a9066a6364b1e063da9679651;p=genkernel.git

Apply patches from Gentoo bug #268468
---

diff --git a/ChangeLog b/ChangeLog
index a888182..1ae5d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  20 Feb 2010; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
+  Apply patches from Gentoo bug #268468
+
   19 Jan 2010; Andrew Gaffney <agaffney@gentoo.org> genkernel:
   Only call set_bootloader is CMD_NOINSTALL is not set for Gentoo bug
   #301454
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index afe4b31..e0710c4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -355,7 +355,12 @@ crypt_filter() {
 	then
 		eval $1 >/dev/null 2>/dev/null
 	else
+		splash 'verbose' > /dev/null &
 		eval $1
+		if [ $? -eq 0 ]
+		then
+			splash set_msg 'Disk unlocked.'
+		fi
 	fi
 }
 
@@ -514,6 +519,7 @@ chooseKeymap() {
 	good_msg "Loading keymaps"
 	if [ -z "${keymap}" ]
 	then
+		splash 'verbose' > /dev/null &
 		cat /lib/keymaps/keymapList
 		read -t 10 -p '<< Load keymap (Enter for default): ' keymap
 		case ${keymap} in
@@ -574,10 +580,12 @@ chooseKeymap() {
 		mkdir -p /etc/sysconfig
 #		echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard
 		echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard
+		splash set_msg "Set keymap to ${keymap}"
 	elif [ -z "${keymap}" ]
 	then
 		echo
 		good_msg "Keeping default keymap"
+		splash set_msg "Keeping default keymap"
 	else
 		bad_msg "Sorry, but keymap ''${keymap}'' is invalid!"
 		unset keymap