Merge branch 'keymaps'

Acked-by: Rick Farina <sidhayn@gmail.com>
cleanup-cruft
Sebastian Pipping 13 years ago
commit 72d3994e6a

@ -5,6 +5,10 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $Id$
09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
defaults/keymaps/keymapList, defaults/keymaps/sf.map:
Add keymap "sf" from Pentoo
08 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel: 08 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.29 Bump version to 3.4.29

@ -575,6 +575,7 @@ chooseKeymap() {
40|uk) keymap=uk ;; 40|uk) keymap=uk ;;
41|us) keymap=us ;; 41|us) keymap=us ;;
42|wangbe) keymap=wangbe ;; 42|wangbe) keymap=wangbe ;;
43|sf|ch*) keymap=sf ;;
esac esac
fi fi
if [ -e /lib/keymaps/${keymap}.map ] if [ -e /lib/keymaps/${keymap}.map ]
@ -585,7 +586,7 @@ chooseKeymap() {
# echo ${keymap} | egrep -e "[0-9]+" >/dev/null 2>&1 # echo ${keymap} | egrep -e "[0-9]+" >/dev/null 2>&1
# if [ $? -eq 0 ] # if [ $? -eq 0 ]
# then # then
# xkeymap=`tail -n 7 /lib/keymaps/keymapList | grep ${keymap} | sed -r "s/.*\s+${keymap}\s+([a-z-]+).*/\1/g" | egrep -v 1` # xkeymap=`tail -n 8 /lib/keymaps/keymapList | grep ${keymap} | sed -r "s/.*\s+${keymap}\s+([a-z-]+).*/\1/g" | egrep -v 1`
# fi # fi
mkdir -p /etc/sysconfig mkdir -p /etc/sysconfig
# echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard # echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1,10 @@
Please select a keymap from the following list by typing in the appropriate
name or number. Hit Enter for the default "us/41" US English keymap.
1 azerty 8 croat 15 fi 22 jp 29 pt 36 slovene 43 sf
2 be 9 cz 16 fr 23 la 30 ro 37 trf
3 bg 10 de 17 gr 24 lt 31 ru
4 br-a 11 dk 18 hu 25 mk 32 se 39 ua
5 br-l 12 dvorak 19 il 26 nl 33 sg 40 uk
6 by 13 es 20 is 27 no 34 sk-y 41 us
7 cf 14 et 21 it 28 pl 35 sk-z 42 wangbe

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -463,7 +463,7 @@ which the ramdisk scripts would recognize.
*keymap*='MAP':: *keymap*='MAP'::
Set keymap to 'MAP', e.g. *keymap*=de. Set keymap to 'MAP', e.g. *keymap*=de.
For valid values of 'MAP' please see For valid values of 'MAP' please see
'/usr/share/genkernel/defaults/keymaps.tar.gz'. '/usr/share/genkernel/defaults/keymaps/'.
*dokeymap*:: *dokeymap*::
Use keymap. Usage of *keymap*= implies this option, already. Use keymap. Usage of *keymap*= implies this option, already.

@ -604,8 +604,10 @@ append_auxilary() {
fi fi
if isTrue $CMD_KEYMAP if isTrue $CMD_KEYMAP
then then
mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps" print_info 1 " >> Copying keymaps"
/bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/defaults/keymaps.tar.gz" mkdir -p "${TEMP}/initramfs-aux-temp/lib/"
cp -R "${GK_SHARE}/defaults/keymaps" "${TEMP}/initramfs-aux-temp/lib/" \
|| gen_die "Error while copying keymaps"
fi fi
cd ${TEMP}/initramfs-aux-temp/sbin && ln -s ../init init cd ${TEMP}/initramfs-aux-temp/sbin && ln -s ../init init

Loading…
Cancel
Save