# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1335909890 -7200
# Node ID 1dbfd813e21eb5ab5e2b375f9c507fdf8c579516
# Parent  8cc80e0d7d4efb91ebdec86d3da994f5e408bc15
Use new tazlocale and tazkeymap functions

diff -r 8cc80e0d7d4e -r 1dbfd813e21e etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Tue Apr 17 15:56:40 2012 +0200
+++ b/etc/init.d/bootopts.sh	Wed May 02 00:04:50 2012 +0200
@@ -68,9 +68,7 @@
 		lang=*)
 			# Check for a specified locale (lang=*).
 			LANG=${opt#lang=}
-			echo -n "Setting system locale to: $LANG... "
-			tazlocale init $LANG
-			status ;;
+			/sbin/tazlocale $LANG ;;
 		kmap=*)
 			# Check for a specified keymap (kmap=*).
 			KEYMAP=${opt#kmap=}
@@ -105,7 +103,7 @@
 					|| mount /dev/$DEVID /home
 				case "$(/sbin/blkid | grep /dev/$DEVID:)" in
 				*\"ntfs\"*|*\"vfat\"*) mount.posixovl /home ;;
-				esac					
+				esac
 				# Check if swap file must be generated in /home: swap=size (Mb).
 				# This option is only used within home=device.
 				if grep -q "swap=[1-9]*" /proc/cmdline; then
diff -r 8cc80e0d7d4e -r 1dbfd813e21e etc/init.d/system.sh
--- a/etc/init.d/system.sh	Tue Apr 17 15:56:40 2012 +0200
+++ b/etc/init.d/system.sh	Wed May 02 00:04:50 2012 +0200
@@ -82,34 +82,29 @@
 # Auto recharge packages list (after network connection of course)
 [ "$RECHARGE_PACKAGES_LIST" == "yes" ] && tazpkg recharge &
 
-# Locale config. Do a gui config for both lang/keymap.
+# Locale config.
 echo "Checking if /etc/locale.conf exists... "
 if [ ! -s "/etc/locale.conf" ]; then
-	echo "Setting system locale to: C (English)"
+	echo "Setting system locale to: POSIX (English)"
 	echo -e "LANG=POSIX\nLC_ALL=POSIX" > /etc/locale.conf
 fi
+. /etc/locale.conf
 echo -n "Locale configuration: $LANG"
-. /etc/locale.conf
-export LANG LC_ALL
-status
+export LC_ALL
+. /lib/libtaz.sh && status
 
-# Keymap config.
+# Keymap config. Default to us in live mode if kmap= was not used.
 if [ ! -s "/etc/keymap.conf" ]; then
 	echo "us" > /etc/keymap.conf
 fi
-KEYMAP=$(cat /etc/keymap.conf)
-echo "Keymap configuration: $KEYMAP"
-if [ -x /bin/loadkeys ]; then
-	loadkeys $KEYMAP
-else
-	loadkmap < /usr/share/kmap/$KEYMAP.kmap
-fi
+kmap=$(cat /etc/keymap.conf)
+echo "Keymap configuration: $kmap"
+/sbin/tazkeymap $kmap
 
 # Timezone config. Set timezone using the keymap config for fr, be, fr_CH
 # and ca with Montreal.
 if [ ! -s "/etc/TZ" ]; then
-	map=$(cat /etc/keymap.conf)
-	case "$map" in
+	case "$kmap" in
 		fr-latin1|be-latin1)
 			echo "Europe/Paris" > /etc/TZ ;;
 		fr_CH-latin1|de_CH-latin1)