[PC-BSD Testing] Installer problem with Japanese user

[Yamashiro, Jun]

On Sun, 16 Sep 2007 09:38:48 -0700
Kris Moore <kris at pcbsd.com> wrote:
> Found it! Turns out some of the scripts were using "ja" for the layout
> instead of "jp" as they should. I fixed it up now, and it should carry
> this over to the installed system as well.

Thanks Kris!

I tested Sept 19th snapshot.  Japanese Keyboard configuration worked fine
with installer and xorg.conf.  But, KDE didn't set "Keyboard model".

I attached patch to installed-overlay/usr/local/pcbsd/scripts/PCBSD.Savekeyboard.sh
This patch add new function: Change keyboard model in $HOME/.kde/share/config/kxkbrc.

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


--- PCBSD.SaveKeyboard.sh.orig	Thu Sep 20 02:19:25 2007
+++ PCBSD.SaveKeyboard.sh	Thu Sep 20 03:06:17 2007
@@ -12,6 +12,24 @@
 nvidia-9639.xorg.conf
 mga-3d-enable.xorg.conf"
 
+# Change KDE keyboard model
+change_kxkbrc() {
+    kbdmodel=$1
+
+    KXKBRC="/mnt/usr/share/skel/.kde/share/config/kxkbrc"
+    KXKBRC_TMP="/mnt/kxkbrc.tmp"
+    cp ${KXKBRC} ${KXKBRC_TMP}
+    sed "s/Model=pc104/Model=${kbdmodel}/" < ${KXKBRC_TMP} > ${KXKBRC}
+
+    for i in `ls /mnt/usr/home`
+    do
+	KXKBRC="/mnt/usr/home/${i}/.kde/share/config/kxkbrc"
+	cp ${KXKBRC} ${KXKBRC_TMP}
+	sed "s/Model=pc104/Model=${kbdmodel}/" < ${KXKBRC_TMP} > ${KXKBRC}
+    done
+    rm -f ${KXKBRC_TMP}
+}
+
 
 # Make sure they keyboard layout is saved
 for i in $HEADERS
@@ -83,6 +101,7 @@
 sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
+change_kxkbrc "abnt2" 
 
 fi
 
@@ -120,5 +139,6 @@
 sed "s/\"pc105\"/\"jp106\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
+change_kxkbrc "jp106" 
 
 fi