Kaynağa Gözat

Removed BROKEN_COMPOSE from console bootscript.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8695 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
DJ Lucas 17 yıl önce
ebeveyn
işleme
ea36f37a5f
2 değiştirilmiş dosya ile 6 ekleme ve 15 silme
  1. 6 2
      bootscripts/ChangeLog
  2. 0 13
      bootscripts/lfs/init.d/console

+ 6 - 2
bootscripts/ChangeLog

@@ -1,7 +1,11 @@
+2008-10-23	DJ Lucas	<dj@linuxfromscratch.org>
+	* lfs/init.d/console: Removed BROKEN_COMPOSE as kernel patch has
+	  been accepted upstream.
+ 
 2008-05-21	Bryan Kadzban	<bryan@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@linuxfromscratch.org>
+2007-08-20	DJ Lucas	<dj@linuxfromscratch.org>
 	* lfs/init.d/setclock: Added missing 'stop' argument to usage text
 
 2007-08-13	Dan Nicholson	<dnicholson@linuxfromscratch.org>

+ 0 - 13
bootscripts/lfs/init.d/console

@@ -76,19 +76,6 @@ case "${1}" in
 			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" |