Apply patches from Gentoo bug #268468

cleanup-cruft
Andrew Gaffney 15 years ago
parent f6c50d59a9
commit f3e0797d42

@ -5,6 +5,9 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $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: 19 Jan 2010; Andrew Gaffney <agaffney@gentoo.org> genkernel:
Only call set_bootloader is CMD_NOINSTALL is not set for Gentoo bug Only call set_bootloader is CMD_NOINSTALL is not set for Gentoo bug
#301454 #301454

@ -355,7 +355,12 @@ crypt_filter() {
then then
eval $1 >/dev/null 2>/dev/null eval $1 >/dev/null 2>/dev/null
else else
splash 'verbose' > /dev/null &
eval $1 eval $1
if [ $? -eq 0 ]
then
splash set_msg 'Disk unlocked.'
fi
fi fi
} }
@ -514,6 +519,7 @@ chooseKeymap() {
good_msg "Loading keymaps" good_msg "Loading keymaps"
if [ -z "${keymap}" ] if [ -z "${keymap}" ]
then then
splash 'verbose' > /dev/null &
cat /lib/keymaps/keymapList cat /lib/keymaps/keymapList
read -t 10 -p '<< Load keymap (Enter for default): ' keymap read -t 10 -p '<< Load keymap (Enter for default): ' keymap
case ${keymap} in case ${keymap} in
@ -574,10 +580,12 @@ chooseKeymap() {
mkdir -p /etc/sysconfig mkdir -p /etc/sysconfig
# echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard # echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard
echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard
splash set_msg "Set keymap to ${keymap}"
elif [ -z "${keymap}" ] elif [ -z "${keymap}" ]
then then
echo echo
good_msg "Keeping default keymap" good_msg "Keeping default keymap"
splash set_msg "Keeping default keymap"
else else
bad_msg "Sorry, but keymap ''${keymap}'' is invalid!" bad_msg "Sorry, but keymap ''${keymap}'' is invalid!"
unset keymap unset keymap

Loading…
Cancel
Save