aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Lucas <dj@linuxfromscratch.org>2008-10-23 05:12:45 +0000
committerDJ Lucas <dj@linuxfromscratch.org>2008-10-23 05:12:45 +0000
commitea36f37a5f872e5e539dc472b17089997ac89191 (patch)
treef40248cb4a40bb149f38ef5b3453442b10d98d6b
parent862c5aedfdbfb0dfccd43d28bbb0ffe8cdb3928d (diff)
Removed BROKEN_COMPOSE from console bootscript.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8695 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--bootscripts/ChangeLog8
-rw-r--r--bootscripts/lfs/init.d/console13
2 files changed, 6 insertions, 15 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 32e06a8b4..4ec455366 100644
--- a/bootscripts/ChangeLog
+++ b/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>
diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console
index e8b853591..aa6232e0a 100644
--- a/bootscripts/lfs/init.d/console
+++ b/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" |