[PC-BSD Commits] r683 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: tim
Date: 2007-09-09 07:10:41 -0700 (Sun, 09 Sep 2007)
New Revision: 683

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
Log:
Accepted patch from yamajun at ofug.net. Fixes keyboard layouts for JP users, and console keymaps users of several different languages.

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-09-08 01:30:34 UTC (rev 682)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-09-09 14:10:41 UTC (rev 683)
@@ -218,7 +218,25 @@
 done
 
 # Set the keylayout in rc.conf
-echo "keymap=\"${KEYLAYOUT}.iso\"" >>/mnt/etc/rc.conf
+case ${KEYLAYOUT} in
+   am) KEYLAYOUT_CONSOLE="hy.armscii-8" ;;
+   cz) KEYLAYOUT_CONSOLE="cz.iso2" ;;
+   de) KEYLAYOUT_CONSOLE="german.iso" ;;
+   dk) KEYLAYOUT_CONSOLE="danish.iso" ;;
+   ee) KEYLAYOUT_CONSOLE="estonian.iso" ;;
+   es) KEYLAYOUT_CONSOLE="spanish.iso" ;;
+   fi) KEYLAYOUT_CONSOLE="finnish.iso" ;;
+   is) KEYLAYOUT_CONSOLE="icelandic.iso" ;;
+   jp) KEYLAYOUT_CONSOLE="jp.106" ;;
+   nl) KEYLAYOUT_CONSOLE="dutch.iso.acc" ;;
+   no) KEYLAYOUT_CONSOLE="norwegian.iso" ;;
+   pl) KEYLAYOUT_CONSOLE="pl_PL.ISO8859-2" ;;
+   sk) KEYLAYOUT_CONSOLE="sk.iso2" ;;
+   se) KEYLAYOUT_CONSOLE="swedish.iso" ;;
+   tr) KEYLAYOUT_CONSOLE="tr.iso9.q" ;;
+   *)  KEYLAYOUT_CONSOLE="${KEYLAYOUT}.iso" ;;
+esac
+echo "keymap=\"${KEYLAYOUT_CONSOLE}\"" >>/mnt/etc/rc.conf
 
 
 # Setup LANG for PBM

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2007-09-08 01:30:34 UTC (rev 682)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2007-09-09 14:10:41 UTC (rev 683)
@@ -1,9 +1,10 @@
 #!/bin/sh
 
+layout=$1
 case ${1} in
    br) map="abnt2" ;; # Brazilian
-   ja) map="jp106" ;; # Japanese
+   ja) map="jp106" ; layout="jp" ;; # Japanese
     *) map="pc104" ;;
 esac
 
-setxkbmap -model $map -layout $1 
+setxkbmap -model $map -layout $layout