[PC-BSD Commits] r15426 - pcbsd/current/src-qt4/pc-xgui/resources/bin

svn at pcbsd.org svn at pcbsd.org
Thu Feb 16 10:22:12 PST 2012


Author: kris
Date: 2012-02-16 18:22:12 +0000 (Thu, 16 Feb 2012)
New Revision: 15426

Modified:
   pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
Log:

If we fail to start with "nvidia" give regular detected "nv" driver a shot again



Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2012-02-16 18:20:21 UTC (rev 15425)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2012-02-16 18:22:12 UTC (rev 15426)
@@ -131,7 +131,9 @@
     # Try running the driver detection again
     rm /etc/X11/xorg.conf
     echo "Saved configuration failed... Running failsafe-detect..." >/dev/console
-    ${PROGDIR}/cardDetect/x_config.sh
+    X -configure >/dev/null 2>&1
+    # Copy over the new xorg.conf
+    cp /root/xorg.conf.new /etc/X11/xorg.conf
   else
     # Still failed, drop to VESA failsafe
     echo "Detected settings failed... Using failsafe VESA 1024x768 mode..." >/dev/console



More information about the Commits mailing list