Changeset 701d318f

Timestamp:

10/23/2008 05:14:25 AM (16 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

7d6c9a6

Parents:

ea36f37a

Message:

Removed BROKEN_COMPOSE from lsb-v3 console bootscript.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8696 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

bootscripts/contrib/lsb-v3

Files:

• ChangeLog (modified) (1 diff)
• init.d/console (modified) (1 diff)

bootscripts/contrib/lsb-v3/ChangeLog

@@ -1 +1 @@
 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.

bootscripts/contrib/lsb-v3/init.d/console

@@ -79 +79 @@
                         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" ] ||