SOURCES: kbd.init - use "locale charmap" to detect UTF-8 locales p...

[qboosh]

Author: qboosh                       Date: Sun Mar  9 12:18:05 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use "locale charmap" to detect UTF-8 locales properly

---- Files affected:
SOURCES:
   kbd.init (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SOURCES/kbd.init
diff -u SOURCES/kbd.init:1.30 SOURCES/kbd.init:1.31
--- SOURCES/kbd.init:1.30	Tue Sep 25 17:50:59 2007
+++ SOURCES/kbd.init	Sun Mar  9 13:18:00 2008
@@ -90,13 +90,11 @@
 	fi
 
 	if [ -n "$KEYTABLE" ]; then
-		case "$LANG" in
-		*.utf8|*.UTF-8)
+		if [ "$(LANG="$LANG" locale charmap)" = "UTF-8" ]; then
 			run_cmd "Loading keyboard table" loadkeys -u $KEYTABLE < /dev/tty0 > /dev/tty0
-			;;
-		*)
+		else
 			run_cmd "Loading keyboard table" loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
-		esac
+		fi
 	fi
 	run_cmd "Enabling SAK sequence" /bin/sh -c "echo Control Alt keycode 101 = SAK | loadkeys"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kbd.init?r1=1.30&r2=1.31&f=u