[PC-BSD Testing] Installer problem with Japanese user

[Yamashiro, Jun]

Sorry, I attached buggy patch for PCBSD.Localize.sh.
Don't apply patches in last mail.

Old patch:
> +echo "keymap=\"${KEYLAYOUT_CONSOLE}.iso\"" >>/mnt/etc/rc.conf
Example:
us -> us.iso.iso

This patch:
> +echo "keymap=\"${KEYLAYOUT_CONSOLE}\"" >>/mnt/etc/rc.conf
us -> us.iso

First patch(1 of 2:  Not changed):
--- PCBSD.SetKeyboard.sh.orig	Sun Sep  9 14:33:37 2007
+++ PCBSD.SetKeyboard.sh	Sun Sep  9 15:38:56 2007
@@ -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


Second patch(2 of 2: Changed):
--- PCBSD.Localize.sh.orig	Sun Sep  9 16:00:11 2007
+++ PCBSD.Localize.sh	Sun Sep  9 18:10:47 2007
@@ -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


-- 
Yamashiro, Jun			Email: yamajun at ofug.net
Okinawa FreeBSD Users Group
	-- This message will *not* self-destruct in five seconds.