SOURCES: kbd.init - `loadkeys -u` for utf8 locales.

pluto pluto at pld-linux.org
Mon Sep 19 01:43:01 CEST 2005


Author: pluto                        Date: Sun Sep 18 23:43:01 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- `loadkeys -u` for utf8 locales.

---- Files affected:
SOURCES:
   kbd.init (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SOURCES/kbd.init
diff -u SOURCES/kbd.init:1.22 SOURCES/kbd.init:1.23
--- SOURCES/kbd.init:1.22	Mon Jun 28 21:24:23 2004
+++ SOURCES/kbd.init	Mon Sep 19 01:42:56 2005
@@ -35,15 +35,6 @@
 		run_cmd "Setting Text Mode $SVGATEXTMODE" SVGATextMode $SVGATEXTMODE
 	fi
 
-	case "$LANG" in
-	    *.utf8|*.UTF-8)
-	    if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
-		unicode_start $SYSFONT $SYSFONTACM
-		CONSOLEFONT=""
-	    fi
-	    ;;
-	esac
-
 	if [ -n "$CONSOLEFONT" ]; then
 		CMD="setfont -m ${CONSOLEMAP:-trivial} $CONSOLEFONT"
 		show "Loading console font and map"
@@ -91,8 +82,15 @@
 		fi
 		ok
 	fi
+
 	if [ -n "$KEYTABLE" ]; then
-		run_cmd "Loading keyboard table" loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
+		case "$LANG" in
+		*.utf8|*.UTF-8)
+			run_cmd "Loading keyboard table" loadkeys -u $KEYTABLE < /dev/tty0 > /dev/tty0
+			;;
+		*)
+			run_cmd "Loading keyboard table" loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
+		esac
 	fi
 	run_cmd "Enabling SAK sequence" /bin/sh -c "echo Control Alt keycode 101 = SAK | loadkeys"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kbd.init?r1=1.22&r2=1.23&f=u




More information about the pld-cvs-commit mailing list