# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1209756682 -7200
# Node ID d7ba6f674f9ce1c13e6f5ad044472aae22be69d3
# Parent  d0ddd8be99c459645e6da03b6c2ee025e5ced273
Use loadkeys and tazkeymap to configure keyboard layout

diff -r d0ddd8be99c4 -r d7ba6f674f9c etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Fri May 02 21:30:17 2008 +0200
+++ b/etc/init.d/bootopts.sh	Fri May 02 21:31:22 2008 +0200
@@ -109,9 +109,9 @@
 # Check for a specified keymap (kmap=*).
 #
 if grep -q "kmap=*" /proc/cmdline; then
-	KMAP=`cat /proc/cmdline | sed 's/.*kmap=\([^ ]*\).*/\1/'`
-	echo -n "Setting system keymap to: $KMAP..."
-	echo "KMAP=$KMAP.kmap" > /etc/kmap.conf
+	KEYMAP=`cat /proc/cmdline | sed 's/.*kmap=\([^ ]*\).*/\1/'`
+	echo -n "Setting system keymap to: $KEYMAP..."
+	echo "$KEYMAP" > /etc/keymap.conf
 	status
 fi
 
diff -r d0ddd8be99c4 -r d7ba6f674f9c etc/init.d/i18n.sh
--- a/etc/init.d/i18n.sh	Fri May 02 21:30:17 2008 +0200
+++ b/etc/init.d/i18n.sh	Fri May 02 21:31:22 2008 +0200
@@ -16,31 +16,29 @@
 
 # Keymap config.
 #
-if [ -f "/etc/kmap.conf" ]; then
-	# Load keymap with Busybox loadkmap.
-	. /etc/kmap.conf
-	echo -n "Loading keymap: $KMAP... "
-	busybox loadkmap < /usr/share/kmap/$KMAP
-	status
+if [ -f "/etc/keymap.conf" ]; then
+	KEYMAP=`cat /etc/keymap.conf`
+	echo "Keymap configuration... "
+	loadkeys $KEYMAP
 else 
-	tazkmap
+	tazkeymap
 fi
 
 # Timezone config. Set timezone using the keymap config for fr, be, fr_CH
 # and ca with Montreal.
 #
 if [ ! -f "/etc/TZ" ]; then
-	. /etc/kmap.conf
-	case "$KMAP" in
-		fr.kmap|be.kmap)
+	KEYMAP=`cat /etc/keymap.conf`
+	case "$KEYMAP" in
+		fr-latin1|be-latin1)
 			echo -n "Setting time zone to Europe/Paris... "
 			echo "Europe/Paris" > /etc/TZ && status
 			;;
-		fr_CH.kmap)
+		fr_CH-latin1|de_CH-latin1)
 			echo -n "Setting time zone to Europe/Zurich... "
 			echo "Europe/Zurich" > /etc/TZ && status
 			;;
-		ca.kmap)
+		cf)
 			echo -n "Setting time zone to America/Montreal... "
 			echo "America/Montreal" > /etc/TZ && status
 			;;