Apply patches from Gentoo bug #268468

diff --git a/ChangeLog b/ChangeLog
index a888182d155fc7593af142ee15f279464dff1c67..1ae5d5f2e0d1a5dee970a4132410b779f24c403d 100644 (file)
--- 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 afe4b31706e60ce7ff7d754fdacb4a83ea07fc9a..e0710c4ed267a4f85f0606844e156e96f864a5fb 100755 (executable)
--- 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