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

[svn at pcbsd.org]

Author: kris
Date: 2007-09-16 09:02:44 -0700 (Sun, 16 Sep 2007)
New Revision: 731

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


Fixed a whole slew of problems with setting / saving the japanese key layout.
I was confused by the lang being set to "ja" while the keyboard was "jp"



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-09-15 06:34:41 UTC (rev 730)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-09-16 16:02:44 UTC (rev 731)
@@ -8,16 +8,11 @@
 intel.xorg.conf
 intel-3d-enable.xorg.conf
 nvidia-100.14.11.xorg.conf
-nvidia-7184.xorg.conf
-nvidia-9746.xorg.conf"
+nvidia-7185.xorg.conf
+nvidia-9639.xorg.conf
+mga-3d-enable.xorg.conf"
 
-case $KEYMAP in
-  ja) KEYMAP="jp" ;;
-   *) ;;
-esac
 
-
-
 # Make sure they keyboard layout is saved
 for i in $HEADERS
 do
@@ -32,6 +27,28 @@
 
 
 
+# Do it for the saved configuration as well
+XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# Do it for the generic VESA config
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# And for the cardDetect header
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+
 if [ "${1}" = "br" ]
 then
 
@@ -45,6 +62,28 @@
 
 done
 
+# Do it for the saved configuration as well
+XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# Do it for the generic VESA config
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"anbt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# And for the cardDetect header
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+
 fi
 
 if [ "${1}" = "jp" ]
@@ -60,4 +99,26 @@
 
 done
 
+# Do it for the saved configuration as well
+XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"jp106\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# Do it for the generic VESA config
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.compat"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"jp106}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+# And for the cardDetect header
+XF86_CFG="/mnt/PCBSD/xorg-gui/cardDetect/XF86Config.default"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"jp106\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
+
 fi

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-15 06:34:41 UTC (rev 730)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2007-09-16 16:02:44 UTC (rev 731)
@@ -3,7 +3,7 @@
 layout=$1
 case ${1} in
    br) map="abnt2" ;; # Brazilian
-   ja) map="jp106" ; layout="jp" ;; # Japanese
+   jp) map="jp106" ; layout="jp" ;; # Japanese
     *) map="pc104" ;;
 esac