- use "locale charmap" to detect UTF-8 locales properly

Changed files:
    kbd.init -> 1.31

diff --git a/kbd.init b/kbd.init
index 905fb617a832cf2111fc73c7de9fb449cfd3ed0b..b19307fdf5f320ff9f3c799b4a3832696a5736c5 100644 (file)
--- a/kbd.init
+++ b/kbd.init
@@ -90,13 +90,11 @@ start() {
        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"