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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-04 11:01:42 -0700 (Mon, 04 Aug 2008)
New Revision: 2521

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
Log:

Updated SaveKeyboard.sh to modify kxkbrc properly when running on non-english



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-08-04 17:57:13 UTC (rev 2520)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-08-04 18:01:42 UTC (rev 2521)
@@ -38,9 +38,15 @@
     cp ${KXKBRC} ${KXKBRC_TMP}
     sed "s/Model=pc104/Model=${MODEL}/" < ${KXKBRC_TMP} > ${KXKBRC}
 
+    # Change the skel files
     KXKBRC_TMP="${FSMNT}/kxkbrc.tmp"
     cp ${KXKBRC} ${KXKBRC_TMP}
-    sed "s/CHANGEME/${KEYMAP}/" < ${KXKBRC_TMP} > ${KXKBRC}
+    sed "s/CHANGEME/${KEYMAP},us/g" < ${KXKBRC_TMP} > ${KXKBRC}
+    
+    # Change the root kxkbrc now
+    KXKBRC="${FSMNT}/root/.kde4/share/config/kxkbrc"
+    cp ${KXKBRC} ${KXKBRC_TMP}
+    sed "s/CHANGEME/${KEYMAP},us/g" < ${KXKBRC_TMP} > ${KXKBRC}
 
     for i in `ls ${FSMNT}/usr/home`
     do