diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2010-02-19 20:20:16 -0600 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2010-02-19 20:20:16 -0600 |
| commit | f3e0797d42ff2e0a9066a6364b1e063da9679651 (patch) | |
| tree | b5f91292c3734b536b8c45fe2d5d9a51d273f6b1 /defaults/initrd.scripts | |
| parent | Only call set_bootloader is CMD_NOINSTALL is not set for Gentoo bug #301454 (diff) | |
| download | genkernel-f3e0797d42ff2e0a9066a6364b1e063da9679651.tar.gz genkernel-f3e0797d42ff2e0a9066a6364b1e063da9679651.tar.bz2 genkernel-f3e0797d42ff2e0a9066a6364b1e063da9679651.zip | |
Apply patches from Gentoo bug #268468
Diffstat (limited to 'defaults/initrd.scripts')
| -rwxr-xr-x | defaults/initrd.scripts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index afe4b317..e0710c4e 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 |