slitaz-tools diff tinyutils/tazx @ rev 583
tazkeymap: dont load keymap twice at boot
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Apr 29 21:21:10 2011 +0200 (2011-04-29) |
parents | 2b8a6ff728b5 |
children | bac3728828c5 |
line diff
1.1 --- a/tinyutils/tazx Wed Apr 20 13:01:00 2011 +0200 1.2 +++ b/tinyutils/tazx Fri Apr 29 21:21:10 2011 +0200 1.3 @@ -57,23 +57,22 @@ 1.4 fr_CH-latin1) 1.5 # Swiss FrenCH 1.6 echo ' Option "XkbLayout" "ch" 1.7 - Option "XkbVariant" "fr"' >> $keyboard_config 1.8 - ;; 1.9 + Option "XkbVariant" "fr"' >> $keyboard_config ;; 1.10 en) 1.11 # Englisk UK 1.12 echo ' Option "XkbLayout" "en" 1.13 - Option "XkbVariant" "en"' >> $keyboard_config 1.14 - ;; 1.15 + Option "XkbVariant" "en"' >> $keyboard_config ;; 1.16 ru) 1.17 # Russian 1.18 echo ' Option "XkbLayout" "us,ru(winkeys)" 1.19 - Option "XkbVariant" "grp:alt_shift_toggle"' >> $keyboard_config 1.20 - ;; 1.21 + Option "XkbVariant" "grp:alt_shift_toggle"' >> $keyboard_config ;; 1.22 slovene) 1.23 # Slovenian 1.24 echo ' Option "XkbLayout" "si" 1.25 - Option "XkbOptions" "grp:alt_shift_toggle"' >> $keyboard_config 1.26 - ;; 1.27 + Option "XkbOptions" "grp:alt_shift_toggle"' >> $keyboard_config ;; 1.28 + us-acentos) 1.29 + echo ' Option "XkbLayout" "us" 1.30 + Option "XkbVariant" "intl"' >> $keyboard_config ;; 1.31 *) 1.32 # Use clean /etc/keymap.conf value. 1.33 keymap=${keymap%-latin1}