[PC-BSD Commits] r17953 - pcbsd/current/overlays/desktop-overlay/usr/local/etc/rc.d

[svn at pcbsd.org]

Author: kris
Date: 2012-07-25 15:38:28 +0000 (Wed, 25 Jul 2012)
New Revision: 17953

Modified:
   pcbsd/current/overlays/desktop-overlay/usr/local/etc/rc.d/gdm
Log:

When the user specifies to run xorg in VESA at the boot-loader, then we
can do so, and skip the display wizard



Modified: pcbsd/current/overlays/desktop-overlay/usr/local/etc/rc.d/gdm
===================================================================
--- pcbsd/current/overlays/desktop-overlay/usr/local/etc/rc.d/gdm	2012-07-25 15:19:01 UTC (rev 17952)
+++ pcbsd/current/overlays/desktop-overlay/usr/local/etc/rc.d/gdm	2012-07-25 15:38:28 UTC (rev 17953)
@@ -96,7 +96,7 @@
     fi
 
     # If the user wants to switch to run the xorg setup again
-    if [ -e "/var/.runxsetup" ]; then
+    if [ -e "/var/.runxsetup" -a "$xvesa" != "YES" ]; then
     	setup_xorg
     fi