SliTaz Repositories

     1.1 --- a/etc/init.d/bootopts.sh	Fri May 02 21:30:17 2008 +0200
     1.2 +++ b/etc/init.d/bootopts.sh	Fri May 02 21:31:22 2008 +0200
     1.3 @@ -109,9 +109,9 @@
     1.4  # Check for a specified keymap (kmap=*).
     1.5  #
     1.6  if grep -q "kmap=*" /proc/cmdline; then
     1.7 -	KMAP=`cat /proc/cmdline | sed 's/.*kmap=\([^ ]*\).*/\1/'`
     1.8 -	echo -n "Setting system keymap to: $KMAP..."
     1.9 -	echo "KMAP=$KMAP.kmap" > /etc/kmap.conf
    1.10 +	KEYMAP=`cat /proc/cmdline | sed 's/.*kmap=\([^ ]*\).*/\1/'`
    1.11 +	echo -n "Setting system keymap to: $KEYMAP..."
    1.12 +	echo "$KEYMAP" > /etc/keymap.conf
    1.13  	status
    1.14  fi
    1.15  

     2.1 --- a/etc/init.d/i18n.sh	Fri May 02 21:30:17 2008 +0200
     2.2 +++ b/etc/init.d/i18n.sh	Fri May 02 21:31:22 2008 +0200
     2.3 @@ -16,31 +16,29 @@
     2.4  
     2.5  # Keymap config.
     2.6  #
     2.7 -if [ -f "/etc/kmap.conf" ]; then
     2.8 -	# Load keymap with Busybox loadkmap.
     2.9 -	. /etc/kmap.conf
    2.10 -	echo -n "Loading keymap: $KMAP... "
    2.11 -	busybox loadkmap < /usr/share/kmap/$KMAP
    2.12 -	status
    2.13 +if [ -f "/etc/keymap.conf" ]; then
    2.14 +	KEYMAP=`cat /etc/keymap.conf`
    2.15 +	echo "Keymap configuration... "
    2.16 +	loadkeys $KEYMAP
    2.17  else 
    2.18 -	tazkmap
    2.19 +	tazkeymap
    2.20  fi
    2.21  
    2.22  # Timezone config. Set timezone using the keymap config for fr, be, fr_CH
    2.23  # and ca with Montreal.
    2.24  #
    2.25  if [ ! -f "/etc/TZ" ]; then
    2.26 -	. /etc/kmap.conf
    2.27 -	case "$KMAP" in
    2.28 -		fr.kmap|be.kmap)
    2.29 +	KEYMAP=`cat /etc/keymap.conf`
    2.30 +	case "$KEYMAP" in
    2.31 +		fr-latin1|be-latin1)
    2.32  			echo -n "Setting time zone to Europe/Paris... "
    2.33  			echo "Europe/Paris" > /etc/TZ && status
    2.34  			;;
    2.35 -		fr_CH.kmap)
    2.36 +		fr_CH-latin1|de_CH-latin1)
    2.37  			echo -n "Setting time zone to Europe/Zurich... "
    2.38  			echo "Europe/Zurich" > /etc/TZ && status
    2.39  			;;
    2.40 -		ca.kmap)
    2.41 +		cf)
    2.42  			echo -n "Setting time zone to America/Montreal... "
    2.43  			echo "America/Montreal" > /etc/TZ && status
    2.44  			;;