commit: a5ea6132ef5afc2bdde38a84adc44849fa9b947f Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Jul 28 14:21:34 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 21:19:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a5ea6132
keymaps: Add bepo and colemak keymap Bug: https://bugs.gentoo.org/442102 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 92 +++++++++++++++++------------------- defaults/keymaps/10.map | 2 +- defaults/keymaps/11.map | 2 +- defaults/keymaps/12.map | 2 +- defaults/keymaps/13.map | 2 +- defaults/keymaps/14.map | 2 +- defaults/keymaps/15.map | 2 +- defaults/keymaps/16.map | 2 +- defaults/keymaps/17.map | 2 +- defaults/keymaps/18.map | 2 +- defaults/keymaps/19.map | 2 +- defaults/keymaps/20.map | 2 +- defaults/keymaps/21.map | 2 +- defaults/keymaps/22.map | 2 +- defaults/keymaps/23.map | 2 +- defaults/keymaps/24.map | 2 +- defaults/keymaps/25.map | 2 +- defaults/keymaps/26.map | 2 +- defaults/keymaps/27.map | 2 +- defaults/keymaps/28.map | 2 +- defaults/keymaps/29.map | 2 +- defaults/keymaps/3.map | 2 +- defaults/keymaps/30.map | 2 +- defaults/keymaps/31.map | 2 +- defaults/keymaps/32.map | 2 +- defaults/keymaps/33.map | 2 +- defaults/keymaps/34.map | 2 +- defaults/keymaps/35.map | 2 +- defaults/keymaps/36.map | 2 +- defaults/keymaps/37.map | 2 +- defaults/keymaps/{35.map => 38.map} | 0 defaults/keymaps/39.map | 2 +- defaults/keymaps/4.map | 2 +- defaults/keymaps/40.map | 2 +- defaults/keymaps/41.map | 2 +- defaults/keymaps/42.map | 2 +- defaults/keymaps/43.map | 2 +- defaults/keymaps/{42.map => 44.map} | 0 defaults/keymaps/5.map | 2 +- defaults/keymaps/6.map | 2 +- defaults/keymaps/7.map | 2 +- defaults/keymaps/8.map | 2 +- defaults/keymaps/9.map | 2 +- defaults/keymaps/bepo.map | Bin 0 -> 2823 bytes defaults/keymaps/colemak.map | Bin 0 -> 2823 bytes defaults/keymaps/keymapList | 16 +++---- 46 files changed, 92 insertions(+), 96 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 827f843..ce38bd8 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1060,61 +1060,57 @@ chooseKeymap() { case ${keymap} in 1|azerty) keymap=azerty ;; 2|be) keymap=be ;; - 3|bg) keymap=bg ;; - 4|br-a) keymap=br-a ;; - 5|br-l) keymap=br-l ;; - 6|by) keymap=by ;; - 7|cf) keymap=cf ;; - 8|croat) keymap=croat ;; - 9|cz) keymap=cz ;; - 10|de) keymap=de ;; - 11|dk) keymap=dk ;; - 12|dvorak) keymap=dvorak ;; - 13|es) keymap=es ;; - 14|et) keymap=et ;; - 15|fi) keymap=fi ;; - 16|fr) keymap=fr ;; - 17|gr) keymap=gr ;; - 18|hu) keymap=hu ;; - 19|il) keymap=il ;; - 20|is) keymap=is ;; - 21|it) keymap=it ;; - 22|jp) keymap=jp ;; - 23|la) keymap=la ;; - 24|lt) keymap=lt ;; - 25|mk) keymap=mk ;; - 26|nl) keymap=nl ;; - 27|no) keymap=no ;; - 28|pl) keymap=pl ;; - 29|pt) keymap=pt ;; - 30|ro) keymap=ro ;; - 31|ru) keymap=ru ;; - 32|se) keymap=se ;; - 33|sg) keymap=sg ;; - 34|sk-y) keymap=sk-y ;; - 35|sk-z) keymap=sk-z ;; - 36|slovene) keymap=slovene ;; - 37|trf) keymap=trf ;; - 38|trq) keymap=trq ;; - 39|ua) keymap=ua ;; - 40|uk) keymap=uk ;; - 41|us) keymap=us ;; - 42|wangbe) keymap=wangbe ;; - 43|sf|ch*) keymap=sf ;; + 3|bepo) keymap=bepo ;; + 4|bg) keymap=bg ;; + 5|br-a) keymap=br-a ;; + 6|br-l) keymap=br-l ;; + 7|by) keymap=by ;; + 8|cf) keymap=cf ;; + 9|colemak) keymap=colemak ;; + 10|croat) keymap=croat ;; + 11|cz) keymap=cz ;; + 12|de) keymap=de ;; + 13|dk) keymap=dk ;; + 14|dvorak) keymap=dvorak ;; + 15|es) keymap=es ;; + 16|et) keymap=et ;; + 17|fi) keymap=fi ;; + 18|fr) keymap=fr ;; + 19|gr) keymap=gr ;; + 20|hu) keymap=hu ;; + 21|il) keymap=il ;; + 22|is) keymap=is ;; + 23|it) keymap=it ;; + 24|jp) keymap=jp ;; + 25|la) keymap=la ;; + 26|lt) keymap=lt ;; + 27|mk) keymap=mk ;; + 28|nl) keymap=nl ;; + 29|no) keymap=no ;; + 30|pl) keymap=pl ;; + 31|pt) keymap=pt ;; + 32|ro) keymap=ro ;; + 33|ru) keymap=ru ;; + 34|se) keymap=se ;; + 35|sf|ch*) keymap=sf ;; + 36|sg) keymap=sg ;; + 37|sk-y) keymap=sk-y ;; + 38|sk-z) keymap=sk-z ;; + 39|slovene) keymap=slovene ;; + 40|trf) keymap=trf ;; + 41|ua) keymap=ua ;; + 42|uk) keymap=uk ;; + 43|us) keymap=us ;; + 44|wangbe) keymap=wangbe ;; esac fi + if [ -e /lib/keymaps/${keymap}.map ] then good_msg "Loading the '${keymap}' keymap ..." loadkmap < /lib/keymaps/${keymap}.map -# xkeymap=${keymap} -# echo ${keymap} | egrep -e "[0-9]+" >/dev/null 2>&1 -# if [ $? -eq 0 ] -# then -# xkeymap=$(tail -n 8 /lib/keymaps/keymapList | grep ${keymap} | sed -r "s/.*\s+${keymap}\s+([a-z-]+).*/\1/g" | egrep -v 1) -# fi + mkdir -p /etc/sysconfig -# echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard splash set_msg "Set keymap to '${keymap}'" elif [ -z "${keymap}" ] diff --git a/defaults/keymaps/10.map b/defaults/keymaps/10.map index 9f72389..0da9af3 120000 --- a/defaults/keymaps/10.map +++ b/defaults/keymaps/10.map @@ -1 +1 @@ -de.map \ No newline at end of file +croat.map \ No newline at end of file diff --git a/defaults/keymaps/11.map b/defaults/keymaps/11.map index bceb1bd..cc77cf9 120000 --- a/defaults/keymaps/11.map +++ b/defaults/keymaps/11.map @@ -1 +1 @@ -dk.map \ No newline at end of file +cz.map \ No newline at end of file diff --git a/defaults/keymaps/12.map b/defaults/keymaps/12.map index 451cc56..9f72389 120000 --- a/defaults/keymaps/12.map +++ b/defaults/keymaps/12.map @@ -1 +1 @@ -dvorak.map \ No newline at end of file +de.map \ No newline at end of file diff --git a/defaults/keymaps/13.map b/defaults/keymaps/13.map index 168fab9..bceb1bd 120000 --- a/defaults/keymaps/13.map +++ b/defaults/keymaps/13.map @@ -1 +1 @@ -es.map \ No newline at end of file +dk.map \ No newline at end of file diff --git a/defaults/keymaps/14.map b/defaults/keymaps/14.map index 3d123bb..451cc56 120000 --- a/defaults/keymaps/14.map +++ b/defaults/keymaps/14.map @@ -1 +1 @@ -et.map \ No newline at end of file +dvorak.map \ No newline at end of file diff --git a/defaults/keymaps/15.map b/defaults/keymaps/15.map index 066af66..168fab9 120000 --- a/defaults/keymaps/15.map +++ b/defaults/keymaps/15.map @@ -1 +1 @@ -fi.map \ No newline at end of file +es.map \ No newline at end of file diff --git a/defaults/keymaps/16.map b/defaults/keymaps/16.map index 80c93fe..3d123bb 120000 --- a/defaults/keymaps/16.map +++ b/defaults/keymaps/16.map @@ -1 +1 @@ -fr.map \ No newline at end of file +et.map \ No newline at end of file diff --git a/defaults/keymaps/17.map b/defaults/keymaps/17.map index 8a051ab..066af66 120000 --- a/defaults/keymaps/17.map +++ b/defaults/keymaps/17.map @@ -1 +1 @@ -gr.map \ No newline at end of file +fi.map \ No newline at end of file diff --git a/defaults/keymaps/18.map b/defaults/keymaps/18.map index 9474d62..80c93fe 120000 --- a/defaults/keymaps/18.map +++ b/defaults/keymaps/18.map @@ -1 +1 @@ -hu.map \ No newline at end of file +fr.map \ No newline at end of file diff --git a/defaults/keymaps/19.map b/defaults/keymaps/19.map index d590003..8a051ab 120000 --- a/defaults/keymaps/19.map +++ b/defaults/keymaps/19.map @@ -1 +1 @@ -il.map \ No newline at end of file +gr.map \ No newline at end of file diff --git a/defaults/keymaps/20.map b/defaults/keymaps/20.map index 7727bac..9474d62 120000 --- a/defaults/keymaps/20.map +++ b/defaults/keymaps/20.map @@ -1 +1 @@ -is.map \ No newline at end of file +hu.map \ No newline at end of file diff --git a/defaults/keymaps/21.map b/defaults/keymaps/21.map index d678e48..d590003 120000 --- a/defaults/keymaps/21.map +++ b/defaults/keymaps/21.map @@ -1 +1 @@ -it.map \ No newline at end of file +il.map \ No newline at end of file diff --git a/defaults/keymaps/22.map b/defaults/keymaps/22.map index 60e7d65..7727bac 120000 --- a/defaults/keymaps/22.map +++ b/defaults/keymaps/22.map @@ -1 +1 @@ -jp.map \ No newline at end of file +is.map \ No newline at end of file diff --git a/defaults/keymaps/23.map b/defaults/keymaps/23.map index d1a9079..d678e48 120000 --- a/defaults/keymaps/23.map +++ b/defaults/keymaps/23.map @@ -1 +1 @@ -la.map \ No newline at end of file +it.map \ No newline at end of file diff --git a/defaults/keymaps/24.map b/defaults/keymaps/24.map index fbb0b72..60e7d65 120000 --- a/defaults/keymaps/24.map +++ b/defaults/keymaps/24.map @@ -1 +1 @@ -lt.map \ No newline at end of file +jp.map \ No newline at end of file diff --git a/defaults/keymaps/25.map b/defaults/keymaps/25.map index f2533fb..d1a9079 120000 --- a/defaults/keymaps/25.map +++ b/defaults/keymaps/25.map @@ -1 +1 @@ -mk.map \ No newline at end of file +la.map \ No newline at end of file diff --git a/defaults/keymaps/26.map b/defaults/keymaps/26.map index 2761f4d..fbb0b72 120000 --- a/defaults/keymaps/26.map +++ b/defaults/keymaps/26.map @@ -1 +1 @@ -nl.map \ No newline at end of file +lt.map \ No newline at end of file diff --git a/defaults/keymaps/27.map b/defaults/keymaps/27.map index b035af9..f2533fb 120000 --- a/defaults/keymaps/27.map +++ b/defaults/keymaps/27.map @@ -1 +1 @@ -no.map \ No newline at end of file +mk.map \ No newline at end of file diff --git a/defaults/keymaps/28.map b/defaults/keymaps/28.map index fbd6e21..2761f4d 120000 --- a/defaults/keymaps/28.map +++ b/defaults/keymaps/28.map @@ -1 +1 @@ -pl.map \ No newline at end of file +nl.map \ No newline at end of file diff --git a/defaults/keymaps/29.map b/defaults/keymaps/29.map index 7978523..b035af9 120000 --- a/defaults/keymaps/29.map +++ b/defaults/keymaps/29.map @@ -1 +1 @@ -pt.map \ No newline at end of file +no.map \ No newline at end of file diff --git a/defaults/keymaps/3.map b/defaults/keymaps/3.map index 63107de..b9efb65 120000 --- a/defaults/keymaps/3.map +++ b/defaults/keymaps/3.map @@ -1 +1 @@ -bg.map \ No newline at end of file +bepo.map \ No newline at end of file diff --git a/defaults/keymaps/30.map b/defaults/keymaps/30.map index a51e4db..fbd6e21 120000 --- a/defaults/keymaps/30.map +++ b/defaults/keymaps/30.map @@ -1 +1 @@ -ro.map \ No newline at end of file +pl.map \ No newline at end of file diff --git a/defaults/keymaps/31.map b/defaults/keymaps/31.map index c23004d..7978523 120000 --- a/defaults/keymaps/31.map +++ b/defaults/keymaps/31.map @@ -1 +1 @@ -ru.map \ No newline at end of file +pt.map \ No newline at end of file diff --git a/defaults/keymaps/32.map b/defaults/keymaps/32.map index 7b5cb3f..a51e4db 120000 --- a/defaults/keymaps/32.map +++ b/defaults/keymaps/32.map @@ -1 +1 @@ -se.map \ No newline at end of file +ro.map \ No newline at end of file diff --git a/defaults/keymaps/33.map b/defaults/keymaps/33.map index b510287..c23004d 120000 --- a/defaults/keymaps/33.map +++ b/defaults/keymaps/33.map @@ -1 +1 @@ -sg.map \ No newline at end of file +ru.map \ No newline at end of file diff --git a/defaults/keymaps/34.map b/defaults/keymaps/34.map index f6cb818..7b5cb3f 120000 --- a/defaults/keymaps/34.map +++ b/defaults/keymaps/34.map @@ -1 +1 @@ -sk-y.map \ No newline at end of file +se.map \ No newline at end of file diff --git a/defaults/keymaps/35.map b/defaults/keymaps/35.map index d2429bb..a0cb60e 120000 --- a/defaults/keymaps/35.map +++ b/defaults/keymaps/35.map @@ -1 +1 @@ -sk-z.map \ No newline at end of file +sf.map \ No newline at end of file diff --git a/defaults/keymaps/36.map b/defaults/keymaps/36.map index e8d5b5f..b510287 120000 --- a/defaults/keymaps/36.map +++ b/defaults/keymaps/36.map @@ -1 +1 @@ -slovene.map \ No newline at end of file +sg.map \ No newline at end of file diff --git a/defaults/keymaps/37.map b/defaults/keymaps/37.map index e76e565..f6cb818 120000 --- a/defaults/keymaps/37.map +++ b/defaults/keymaps/37.map @@ -1 +1 @@ -trf.map \ No newline at end of file +sk-y.map \ No newline at end of file diff --git a/defaults/keymaps/35.map b/defaults/keymaps/38.map similarity index 100% copy from defaults/keymaps/35.map copy to defaults/keymaps/38.map diff --git a/defaults/keymaps/39.map b/defaults/keymaps/39.map index 3e8aa5b..e8d5b5f 120000 --- a/defaults/keymaps/39.map +++ b/defaults/keymaps/39.map @@ -1 +1 @@ -ua.map \ No newline at end of file +slovene.map \ No newline at end of file diff --git a/defaults/keymaps/4.map b/defaults/keymaps/4.map index 1c53a25..63107de 120000 --- a/defaults/keymaps/4.map +++ b/defaults/keymaps/4.map @@ -1 +1 @@ -br-a.map \ No newline at end of file +bg.map \ No newline at end of file diff --git a/defaults/keymaps/40.map b/defaults/keymaps/40.map index 0eca050..e76e565 120000 --- a/defaults/keymaps/40.map +++ b/defaults/keymaps/40.map @@ -1 +1 @@ -uk.map \ No newline at end of file +trf.map \ No newline at end of file diff --git a/defaults/keymaps/41.map b/defaults/keymaps/41.map index 2a3add6..3e8aa5b 120000 --- a/defaults/keymaps/41.map +++ b/defaults/keymaps/41.map @@ -1 +1 @@ -us.map \ No newline at end of file +ua.map \ No newline at end of file diff --git a/defaults/keymaps/42.map b/defaults/keymaps/42.map index c800071..0eca050 120000 --- a/defaults/keymaps/42.map +++ b/defaults/keymaps/42.map @@ -1 +1 @@ -wangbe.map \ No newline at end of file +uk.map \ No newline at end of file diff --git a/defaults/keymaps/43.map b/defaults/keymaps/43.map index a0cb60e..2a3add6 120000 --- a/defaults/keymaps/43.map +++ b/defaults/keymaps/43.map @@ -1 +1 @@ -sf.map \ No newline at end of file +us.map \ No newline at end of file diff --git a/defaults/keymaps/42.map b/defaults/keymaps/44.map similarity index 100% copy from defaults/keymaps/42.map copy to defaults/keymaps/44.map diff --git a/defaults/keymaps/5.map b/defaults/keymaps/5.map index 171e281..1c53a25 120000 --- a/defaults/keymaps/5.map +++ b/defaults/keymaps/5.map @@ -1 +1 @@ -br-l.map \ No newline at end of file +br-a.map \ No newline at end of file diff --git a/defaults/keymaps/6.map b/defaults/keymaps/6.map index daaf368..171e281 120000 --- a/defaults/keymaps/6.map +++ b/defaults/keymaps/6.map @@ -1 +1 @@ -by.map \ No newline at end of file +br-l.map \ No newline at end of file diff --git a/defaults/keymaps/7.map b/defaults/keymaps/7.map index d233aed..daaf368 120000 --- a/defaults/keymaps/7.map +++ b/defaults/keymaps/7.map @@ -1 +1 @@ -cf.map \ No newline at end of file +by.map \ No newline at end of file diff --git a/defaults/keymaps/8.map b/defaults/keymaps/8.map index 0da9af3..d233aed 120000 --- a/defaults/keymaps/8.map +++ b/defaults/keymaps/8.map @@ -1 +1 @@ -croat.map \ No newline at end of file +cf.map \ No newline at end of file diff --git a/defaults/keymaps/9.map b/defaults/keymaps/9.map index cc77cf9..cc3ef87 120000 --- a/defaults/keymaps/9.map +++ b/defaults/keymaps/9.map @@ -1 +1 @@ -cz.map \ No newline at end of file +colemak.map \ No newline at end of file diff --git a/defaults/keymaps/bepo.map b/defaults/keymaps/bepo.map new file mode 100644 index 0000000..ee0ef15 Binary files /dev/null and b/defaults/keymaps/bepo.map differ diff --git a/defaults/keymaps/colemak.map b/defaults/keymaps/colemak.map new file mode 100644 index 0000000..ee0ef15 Binary files /dev/null and b/defaults/keymaps/colemak.map differ diff --git a/defaults/keymaps/keymapList b/defaults/keymaps/keymapList index 4ad3721..f46ff0a 100644 --- a/defaults/keymaps/keymapList +++ b/defaults/keymaps/keymapList @@ -1,10 +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. +name or number. Hit Enter for the default "us/43" 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 38 -- - 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 + 1 azerty 8 cf 15 es 22 is 29 no 36 sg 43 us + 2 be 9 colemak 16 et 23 it 30 pl 37 sk-y 44 wangbe + 3 bepo 10 croat 17 fi 24 jp 31 pt 38 sk-z + 4 bg 11 cz 18 fr 25 la 32 ro 39 slovene + 5 br-a 12 de 19 gr 26 lt 33 ru 40 trf + 6 br-l 13 dk 20 hu 27 mk 34 se 41 ua + 7 by 14 dvorak 21 il 28 nl 35 sf 42 uk
