[PC-BSD Commits] r15428 - pcbsd/current/mfsroot-overlay/root

svn at pcbsd.org svn at pcbsd.org
Thu Feb 16 10:26:46 PST 2012


Author: kris
Date: 2012-02-16 18:26:46 +0000 (Thu, 16 Feb 2012)
New Revision: 15428

Modified:
   pcbsd/current/mfsroot-overlay/root/functions.sh
Log:

Use "nvidia" driver first, fallback to "nv" if it fails



Modified: pcbsd/current/mfsroot-overlay/root/functions.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/functions.sh	2012-02-16 18:22:41 UTC (rev 15427)
+++ pcbsd/current/mfsroot-overlay/root/functions.sh	2012-02-16 18:26:46 UTC (rev 15428)
@@ -11,6 +11,8 @@
   X -configure >/dev/null 2>&1
   # Copy over the new xorg.conf
   cp /root/xorg.conf.new /etc/X11/xorg.conf
+  # Use nvidia driver
+  sed -i '' 's|"nv"|"nvidia"|g' /etc/X11/xorg.conf
   /root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
 
   # Check for VESA support
@@ -36,7 +38,10 @@
     # Failed to start X with detected driver. Now try our detection mode.
     echo "ERROR: Failed to start X with detected driver... Trying SAFE mode..."
     rm /etc/X11/xorg.conf
-    /root/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
+    /root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
     startx
     if [ ! -e "/tmp/.xstarted" ]
     then



More information about the Commits mailing list