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

[svn at pcbsd.org]

Author: kris
Date: 2007-06-29 21:37:23 +0100 (Fri, 29 Jun 2007)
New Revision: 400

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

Changes to save the keyboard layout to the various xorg conf pieces



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-06-29 20:21:46 UTC (rev 399)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-06-29 20:37:23 UTC (rev 400)
@@ -3,18 +3,24 @@
 KEYMAP="${1}"
 
 # Make sure they keyboard layout is saved
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/xorg.conf.header"
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/xorg.conf.generic"
 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}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/autoDetect/XF86Config.default"
+# Do the intel header now
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/i810.xorg.conf"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
+XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
+
 if [ "${1}" = "br" ]
 then
 
@@ -22,10 +28,15 @@
 sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/autoDetect/XF86Config.default"
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/xorg.conf.generic"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/i810.xorg.conf"
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}
 
+
 fi