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

[svn at pcbsd.org]

Author: melkor
Date: 2008-05-18 13:16:05 -0700 (Sun, 18 May 2008)
New Revision: 1909

Added:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/XF86Config.qemu
Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/x_config.sh
Log:

Add QEMU support to X configuration tool


Added: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/XF86Config.qemu

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/x_config.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/x_config.sh	2008-05-18 19:30:38 UTC (rev 1908)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/cardDetect/x_config.sh	2008-05-18 20:16:05 UTC (rev 1909)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Name    : XFree86 autoconfiguration script
+# Name    : Xorg autoconfiguration script
 # Version : 0.1
 # Author  : Sergei Mozhaisky (techniX)
 # Adapted for RoFreeSBIE CD by Angelescu Ovidiu
@@ -9,6 +9,8 @@
 XFREE_NEWCONF="/root/xorg.conf.new"
 XFREE_TMPCONF="/usr/local/pcbsd/scripts/cardDetect/XF86Config.default"
 XFREE_VMWARE="/usr/local/pcbsd/scripts/cardDetect/XF86Config.vmware"
+XFREE_QEMU="/usr/local/pcbsd/scripts/cardDetect/XF86Config.qemu"
+XFREE_SAFE="/usr/local/pcbsd/scripts/cardDetect/XF86Config.safe"
 
 if [ -f ${XFREE_CONF} ]; then
 	echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."
@@ -18,8 +20,14 @@
 echo -n "Autoconfiguring X Server..."
 
 VMWARE=`pciconf -lv | grep -i vmware`
+QEMU=`pciconf -lv | fgrep CL-GD5446`
 if [ "${VMWARE}" != "" ]; then
 	cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
+elif [ "$QEMU" != "" ]; then
+        cp ${XFREE_QEMU} ${XFREE_NEWCONF}
+        # Must enable 16 bit color
+        cat ${XFREE_TMPCONF} | sed "s/#%DEFAULTDEPTH%/DefaultDepth 16/" > ${XFREE_TMPCONF}.QEMU
+        XFREE_TMPCONF="${XFREE_TMPCONF}.QEMU"
 else
         # configuring X automatically
 	/usr/local/bin/X -configure >/dev/null 2>&1