[PC-BSD Commits] r13856 - in pcbsd/current/mfsroot-overlay/root: . cardDetect

[svn at pcbsd.org]

Author: kris
Date: 2011-11-14 08:50:25 -0800 (Mon, 14 Nov 2011)
New Revision: 13856

Added:
   pcbsd/current/mfsroot-overlay/root/cardDetect/XF86Config.intel
Modified:
   pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
   pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh
Log:

Add some extra xorg glue, so we can try the intel driver one last time, which fixes optimus drivers




Modified: pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh	2011-11-14 16:24:21 UTC (rev 13855)
+++ pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh	2011-11-14 16:50:25 UTC (rev 13856)
@@ -89,11 +89,17 @@
   startx 2>/tmp/xstartup2.log
   if [ ! -e "/tmp/.xstarted" ]
   then
-    echo "ERROR: Failed to start GUI Installer with VESA mode..." 
-    echo "Please check your settings in the /etc/X11/xorg.conf file" 
-    echo "[Press Enter to Continue]"
-    read tmp
-    /root/PCBSDtext.sh
+    # Try the Intel driver, since nvidia/vesa will fail on optimus cards
+    cp /root/cardDetect/XF86Config.intel /etc/X11/xorg.conf
+    startx 2>/tmp/xstartup2.log
+    if [ ! -e "/tmp/.xstarted" ]
+    then
+      echo "ERROR: Failed to start GUI Installer..." 
+      echo "Please check your settings in the /etc/X11/xorg.conf file" 
+      echo "[Press Enter to Continue]"
+      read tmp
+      /root/PCBSDtext.sh
+    fi
   fi
 fi
 

Modified: pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh	2011-11-14 16:24:21 UTC (rev 13855)
+++ pcbsd/current/mfsroot-overlay/root/PCBSDStartLive.sh	2011-11-14 16:50:25 UTC (rev 13856)
@@ -104,11 +104,17 @@
     startx
     if [ ! -e "/tmp/.xstarted" ]
     then
-      echo "ERROR: Failed to start X with VESA mode..."
-      echo "Dropping to failsafe console... Edit /etc/X11/xorg.conf, and run #startx to bring up the GUI."
-      echo "[Press Enter to Continue]"
-      read tmp
-      /bin/sh
+      # Try the Intel driver, since nvidia/vesa will fail on optimus cards
+      cp /root/cardDetect/XF86Config.intel /etc/X11/xorg.conf
+      startx
+      if [ ! -e "/tmp/.xstarted" ]
+      then
+        echo "ERROR: Failed to start X..."
+        echo "Dropping to failsafe console... Edit /etc/X11/xorg.conf, and run #startx to bring up the GUI."
+        echo "[Press Enter to Continue]"
+        read tmp
+        /bin/sh
+      fi
     fi
   fi
 fi