[PC-BSD Commits] r396 - livepcbsd/extra/customroot/PCBSD/cardDetect

svn at pcbsd.org svn at pcbsd.org
Fri Jun 29 11:55:31 PDT 2007


Author: andrei
Date: 2007-06-29 19:55:31 +0100 (Fri, 29 Jun 2007)
New Revision: 396

Added:
   livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.default
   livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.default.original
   livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.vmware
Removed:
   livepcbsd/extra/customroot/PCBSD/cardDetect/XF86Config.default
   livepcbsd/extra/customroot/PCBSD/cardDetect/XF86Config.vmware
Modified:
   livepcbsd/extra/customroot/PCBSD/cardDetect/x_config.sh
Log:
Updated Xorg autodetection scripts.


Deleted: livepcbsd/extra/customroot/PCBSD/cardDetect/XF86Config.default

Deleted: livepcbsd/extra/customroot/PCBSD/cardDetect/XF86Config.vmware

Modified: livepcbsd/extra/customroot/PCBSD/cardDetect/x_config.sh
===================================================================
--- livepcbsd/extra/customroot/PCBSD/cardDetect/x_config.sh	2007-06-29 15:56:14 UTC (rev 395)
+++ livepcbsd/extra/customroot/PCBSD/cardDetect/x_config.sh	2007-06-29 18:55:31 UTC (rev 396)
@@ -1,14 +1,15 @@
 #!/bin/sh
 #
 # Name    : XFree86 autoconfiguration script
-# Version : 0.1
+# Version : 0.2
 # Author  : Sergei Mozhaisky (techniX)
 # Adapted for RoFreeSBIE CD by Angelescu Ovidiu
+# Adapted for PC-BSD LiveCD by Andrei Kolu 29.06.2007
 
-XFREE_CONF="/etc/X11/XF86Config"
-XFREE_NEWCONF="/xorg.conf.new"
-XFREE_TMPCONF="/PCBSD/cardDetect/XF86Config.default"
-XFREE_VMWARE="/PCBSD/cardDetect/XF86Config.vmware"
+XFREE_CONF="/etc/X11/xorg.conf"
+XFREE_NEWCONF="/root/xorg.conf.new"
+XFREE_TMPCONF="/PCBSD/cardDetect/xorg.conf.default"
+XFREE_VMWARE="/PCBSD/cardDetect/xorg.conf.vmware"
 
 if [ -f ${XFREE_CONF} ]; then
 	echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."
@@ -22,7 +23,7 @@
 	cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
 else
         # configuring X automatically
-	/usr/X11R6/bin/X -configure >/dev/null 2>&1
+	/usr/local/bin/X -configure >/dev/null 2>&1
 fi
 
 X_MON=`/usr/bin/sed -n '/^Section "Monitor"$/,/^EndSection$/ p' $XFREE_NEWCONF`

Added: livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.default

Added: livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.default.original

Added: livepcbsd/extra/customroot/PCBSD/cardDetect/xorg.conf.vmware



More information about the Commits mailing list