From 701d318f14816577da6c85735bdfae626f647195 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Thu, 23 Oct 2008 05:14:25 +0000 Subject: Removed BROKEN_COMPOSE from lsb-v3 console bootscript. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8696 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/contrib/lsb-v3/ChangeLog | 3 +++ bootscripts/contrib/lsb-v3/init.d/console | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'bootscripts') diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog index dc2fe95d5..ba86819ef 100644 --- a/bootscripts/contrib/lsb-v3/ChangeLog +++ b/bootscripts/contrib/lsb-v3/ChangeLog @@ -1,4 +1,7 @@ ChangeLog +20081023 - [dj] * Removed BROKEN_COMPOSE handling in console script because + kernel patch was accepted upstream. + 20080908 - [dj] * Corrected echo command in rc script - Thanks to Michael Tremer at IPFire. diff --git a/bootscripts/contrib/lsb-v3/init.d/console b/bootscripts/contrib/lsb-v3/init.d/console index 071750125..dc8bd837b 100644 --- a/bootscripts/contrib/lsb-v3/init.d/console +++ b/bootscripts/contrib/lsb-v3/init.d/console @@ -78,19 +78,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" | -- cgit v1.2.3-54-g00ecf