Updated the keymap-handling code so it will be installed and displayed without using --do-auto-keymap with a patch from Florian Schilhabel <fernsehleo@gmx.net> for bug #215822. Also, added a keymap= command line option to allow setting keymap from the bootloader, also from Florian.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@669 67a159dc-881f-0410-a524-ba9dfbe2cb84

ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
+  gen_funcs.sh, generic/initrd.scripts, generic/linuxrc:
+  Updated the keymap-handling code so it will be installed and displayed
+  without using --do-auto-keymap with a patch from Florian Schilhabel
+  <fernsehleo@gmx.net> for bug #215822. Also, added a keymap= command line
+  option to allow setting keymap from the bootloader, also from Florian.
+
   22 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts:
   Change from using a directory check to a file check. This should fix bug

gen_funcs.sh

@@ -486,11 +486,15 @@ set_config_with_override() {
 		if [ -n "${!CfgVar}" ]
 		then
 			Result=${!CfgVar}
+			# we need to set the CMD_* according to configfile...
+			eval ${OverrideVar}=\"${Result}\"
 			print_info 5 "  $CfgVar set in config file to \"${Result}\"."
 		else
 			if [ -n "$Default" ]
 			then
 				Result=${Default}
+				# set OverrideVar to Result, otherwise CMD_* may not be initialized...
+				eval ${OverrideVar}=\"${Result}\"
 				print_info 5 "  $CfgVar defaulted to \"${Result}\"."
 			else
 				print_info 5 "  $CfgVar not set."

generic/initrd.scripts

@@ -521,6 +521,8 @@ setup_keymap() {
 
 chooseKeymap() {
 	good_msg "Loading keymaps"
+	if [ -z "${keymap}" ]
+	then
 		cat /lib/keymaps/keymapList
 		read -t 10 -p '<< Load keymap (Enter for default): ' keymap
 		case ${keymap} in
@@ -567,6 +569,7 @@ chooseKeymap() {
 			41|us) keymap=us ;;
 			42|wangbe) keymap=wangbe ;;
 		esac
+	fi
 	if [ -e /lib/keymaps/${keymap}.map ]
 	then
 		good_msg "Loading the ''${keymap}'' keymap"
@@ -580,7 +583,7 @@ chooseKeymap() {
 		mkdir -p /etc/sysconfig
 #		echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard
 		echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard
-	elif [ "$keymap" = '' ]
+	elif [ -z "${keymap}" ]
 	then
 		echo
 		good_msg "Keeping default keymap"

generic/linuxrc

@@ -180,6 +180,9 @@ do
 		real_rootflags\=*)
 			REAL_ROOTFLAGS=`parse_opt "${x}"`
 		;;
+		keymap\=*)
+			keymap=`parse_opt "${x}"`
+		;;
 	esac
 done