r8695 - in trunk/BOOK/bootscripts: . lfs/init.d

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed Oct 22 22:12:45 PDT 2008


Author: dj
Date: 2008-10-22 23:12:45 -0600 (Wed, 22 Oct 2008)
New Revision: 8695

Modified:
   trunk/BOOK/bootscripts/ChangeLog
   trunk/BOOK/bootscripts/lfs/init.d/console
Log:
Removed BROKEN_COMPOSE from console bootscript.

Modified: trunk/BOOK/bootscripts/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/ChangeLog	2008-10-23 04:32:05 UTC (rev 8694)
+++ trunk/BOOK/bootscripts/ChangeLog	2008-10-23 05:12:45 UTC (rev 8695)
@@ -1,7 +1,11 @@
+2008-10-23	DJ Lucas	<dj at linuxfromscratch.org>
+	* lfs/init.d/console: Removed BROKEN_COMPOSE as kernel patch has
+	  been accepted upstream.
+ 
 2008-05-21	Bryan Kadzban	<bryan at linuxfromscratch.org>
-	* lfs/init.d/udev, lfs/init.d/udev_retry: Use new udevadm program.
+	* lfs/init.d/udev: lfs/init.d/udev_retry: Use new udevadm program.
 
-2007-08-20	DJ Lucas <dj at linuxfromscratch.org>
+2007-08-20	DJ Lucas	<dj at linuxfromscratch.org>
 	* lfs/init.d/setclock: Added missing 'stop' argument to usage text
 
 2007-08-13	Dan Nicholson	<dnicholson at linuxfromscratch.org>

Modified: trunk/BOOK/bootscripts/lfs/init.d/console
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/console	2008-10-23 04:32:05 UTC (rev 8694)
+++ trunk/BOOK/bootscripts/lfs/init.d/console	2008-10-23 05:12:45 UTC (rev 8695)
@@ -76,19 +76,6 @@
 			loadkeys ${KEYMAP_CORRECTIONS} >/dev/null 2>&1 ||
 			failed=1
 
-		# Linux kernel generates wrong bytes when composing
-		# in Unicode mode. That's why we disable dead keys in Unicode
-		# mode by default. If you need them, download and apply
-		# http://www.linuxfromscratch.org/~alexander/patches/linux-2.6.12.5-utf8_input-2.patch
-		# After patching, add "-m charset_of_your_keymap" to the FONT
-		# variable and set BROKEN_COMPOSE=false
-		# in /etc/sysconfig/console
-
-		[ -n "$BROKEN_COMPOSE" ] || BROKEN_COMPOSE="$UNICODE"
-		! is_true "$BROKEN_COMPOSE" ||
-			echo "" | loadkeys -c >/dev/null 2>&1 ||
-			failed=1
-		
 		# Convert the keymap from $LEGACY_CHARSET to UTF-8
 		[ -z "$LEGACY_CHARSET" ] ||
 			dumpkeys -c "$LEGACY_CHARSET" |




More information about the lfs-book mailing list