r1310 - trunk/packages/lfs-bootscripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Dec 24 05:48:36 PST 2005


Author: alexander
Date: 2005-12-24 06:48:34 -0700 (Sat, 24 Dec 2005)
New Revision: 1310

Modified:
   trunk/packages/lfs-bootscripts/lang.dat
   trunk/packages/lfs-bootscripts/langconf
Log:
Adapted console configurator to the "en_US" -> "us" keymap name change


Modified: trunk/packages/lfs-bootscripts/lang.dat
===================================================================
--- trunk/packages/lfs-bootscripts/lang.dat	2005-12-24 13:44:43 UTC (rev 1309)
+++ trunk/packages/lfs-bootscripts/lang.dat	2005-12-24 13:48:34 UTC (rev 1310)
@@ -1,25 +1,25 @@
 # DESCRIPTION				LANG		KEYMAP		LEGACY_CHARSET	XKEYMAP
-Default/Other				C		""		""		"en_US"
-English,_USA_(ISO-8859-1)		en_US		""		""		"en_US"
-English,_USA_(UTF-8)			en_US.UTF-8	""		"iso-8859-1"	"en_US"
+Default/Other				C		""		""		"us"
+English,_USA_(ISO-8859-1)		en_US		""		""		"us"
+English,_USA_(UTF-8)			en_US.UTF-8	""		"iso-8859-1"	"us"
 English,_GB_(ISO-8859-1)		en_GB		"gb"		""		"uk"
 English,_GB_(UTF-8)			en_GB.UTF-8	"gb"		"iso-8859-1"	"uk"
-English,_Australia_(ISO-8859-1)		en_AU		""		""		"en_US"
-English,_Australia_(UTF-8)		en_AU.UTF-8	""		"iso-8859-1"	"en_US"
+English,_Australia_(ISO-8859-1)		en_AU		""		""		"us"
+English,_Australia_(UTF-8)		en_AU.UTF-8	""		"iso-8859-1"	"us"
 
-Belarusian_(CP1251)			be_BY		"by2_win"	""		"en_US,by(winkeys)"
-Belarusian_(UTF-8)			be_BY.UTF-8	"by"		"iso-8859-5"	"en_US,by(winkeys)"
+Belarusian_(CP1251)			be_BY		"by2_win"	""		"us,by(winkeys)"
+Belarusian_(UTF-8)			be_BY.UTF-8	"by"		"iso-8859-5"	"us,by(winkeys)"
 Brazilian,_ABNT2_keymap_(ISO-8859-1)	pt_BR		"br-abnt2"	""		"br-abnt2"
 Brazilian,_ABNT2_keymap_(UTF-8)		pt_BR.UTF-8	"br-abnt2"	"iso-8859-1"	"br-abnt2"
-Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""		"en_US,bds_enhanced"
-Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""		"en_US,bds_enhanced"
-Chinese_(Traditional,_BIG5)		zh_TW		""		""		"en_US"
-Chinese_(Traditional,_EUC-TW)		zh_TW.EUC-TW	""		""		"en_US"
-Chinese_(Traditional,_UTF-8)		zh_TW.UTF-8	""		""		"en_US"
-Chinese_(Simplified,_GB2312)		zh_CN		""		""		"en_US"
-Chinese_(Simplified,_GB18030)		zh_CN.GB18030	""		""		"en_US"
-Chinese_(Simplified,_GBK)		zh_CN.GBK	""		""		"en_US"
-Chinese_(Simplified,_UTF-8)		zh_CN.UTF-8	""		""		"en_US"
+Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""		"us,bds_enhanced"
+Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""		"us,bds_enhanced"
+Chinese_(Traditional,_BIG5)		zh_TW		""		""		"us"
+Chinese_(Traditional,_EUC-TW)		zh_TW.EUC-TW	""		""		"us"
+Chinese_(Traditional,_UTF-8)		zh_TW.UTF-8	""		""		"us"
+Chinese_(Simplified,_GB2312)		zh_CN		""		""		"us"
+Chinese_(Simplified,_GB18030)		zh_CN.GB18030	""		""		"us"
+Chinese_(Simplified,_GBK)		zh_CN.GBK	""		""		"us"
+Chinese_(Simplified,_UTF-8)		zh_CN.UTF-8	""		""		"us"
 Czech_(ISO-8859-2)			cs_CZ		"cz"		""		"cz"
 Czech_(UTF-8)				cs_CZ.UTF-8	"cz"		"iso-8859-2"	"cz"
 Danish_(ISO-8859-1)			da_DK		"dk-latin1"	""		"dk"
@@ -35,16 +35,16 @@
 German_(ISO-8859-1)			de_DE		"de-latin1"	""		"de"
 German_(ISO-8859-15)			de_DE at euro	"de-latin1+euro2" ""		"de"
 German_(UTF-8)				de_DE.UTF-8	"de-latin1+euro2" "iso-8859-15"	"de"
-Greek_(ISO-8859-7)			el_GR		"gr"		""		"en_US,el"
-Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso-8859-7"	"en_US,el"
+Greek_(ISO-8859-7)			el_GR		"gr"		""		"us,el"
+Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso-8859-7"	"us,el"
 Hungarian_(ISO-8859-2)			hu_HU		"hu101"		""		"hu"
 Hungarian_(UTF-8)			hu_HU.UTF-8	"hu101"		"iso-8859-2"	"hu"
 Icelandic_(ISO-8859-1)			is_IS		"is-latin1"	""		"is"
 Icelandic_(UTF-8)			is_IS.UTF-8	"is-latin1"	"iso-8859-1"	"is"
-Japanese_(EUC-JP)			ja_JP		""		""		"en_US"
-Japanese_(UTF-8)			ja_JP.UTF-8	""		""		"en_US"
-Korean_(EUC-KR)				ko_KR		""		""		"en_US"
-Korean_(UTF-8)				ko_KR.UTF-8	""		""		"en_US"
+Japanese_(EUC-JP)			ja_JP		""		""		"us"
+Japanese_(UTF-8)			ja_JP.UTF-8	""		""		"us"
+Korean_(EUC-KR)				ko_KR		""		""		"us"
+Korean_(UTF-8)				ko_KR.UTF-8	""		""		"us"
 Norwegian,_Bokmal_(ISO-8859-1)		nb_NO		"no-latin1"	""		"no"
 Norwegian,_Bokmal_(UTF-8)		nb_NO.UTF-8	"no-latin1"	"iso-8859-1"	"no"
 Norwegian,_Nynorsk_(ISO-8859-1)		nn_NO		"no-latin1"	""		"no"
@@ -54,9 +54,9 @@
 Portuguese_(ISO-8859-1)			pt_PT		"pt-latin1"	""		"pt"
 Portuguese_(ISO-8859-15)		pt_PT at euro	"pt-latin9"	""		"pt"
 Portuguese_(UTF-8)			pt_PT.UTF-8	"pt-latin9"	"iso-8859-15"	"pt"
-Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""		"en_US,ru(winkeys)"
-Russian_(KOI8-R)			ru_RU.KOI8-R	"ru-ms"		""		"en_US,ru(winkeys)"
-Russian_(UTF-8)				ru_RU.UTF-8	"ru-ms"		"koi8-r"	"en_US,ru(winkeys)"
+Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""		"us,ru(winkeys)"
+Russian_(KOI8-R)			ru_RU.KOI8-R	"ru-ms"		""		"us,ru(winkeys)"
+Russian_(UTF-8)				ru_RU.UTF-8	"ru-ms"		"koi8-r"	"us,ru(winkeys)"
 Slovak,_QWERTZ_keyboard_(ISO-8859-2)	sk_SK		"sk-qwertz"	""		"sk"
 Slovak,_QWERTZ_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwertz"	"iso-8859-2"	"sk"
 Slovak,_QWERTY_keyboard_(ISO-8859-2)	sk_SK		"sk-qwerty"	""		"sk_qwerty"
@@ -68,7 +68,7 @@
 Spanish,_Mexico_(UTF-8)			es_MX.UTF-8	"la-latin1"	"iso-8859-1"	"la"
 Swedish_(ISO-8859-1)			sv_SE		"sv-latin1"	""		"se"
 Swedish_(UTF-8)				sv_SE.UTF-8	"sv-latin1"	"iso-8859-1"	"se"
-Thai_(TIS-620)				th_TH		"th-win-latin1"	""		"en_US,th"
-Thai_(UTF-8)				th_TH.UTF-8	"th-win-uni"	""		"en_US,th"
-Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""		"en_US,ua(winkeys)"
-Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""		"en_US,ua(winkeys)"
+Thai_(TIS-620)				th_TH		"th-win-latin1"	""		"us,th"
+Thai_(UTF-8)				th_TH.UTF-8	"th-win-uni"	""		"us,th"
+Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""		"us,ua(winkeys)"
+Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""		"us,ua(winkeys)"

Modified: trunk/packages/lfs-bootscripts/langconf
===================================================================
--- trunk/packages/lfs-bootscripts/langconf	2005-12-24 13:44:43 UTC (rev 1309)
+++ trunk/packages/lfs-bootscripts/langconf	2005-12-24 13:48:34 UTC (rev 1310)
@@ -181,7 +181,7 @@
 	echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 fi
 
-sed -i "s/\"en_US\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
+sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
 
 if [ "$F_ERROR" = "3" ]
 then




More information about the livecd mailing list