[PC-BSD Commits] r6489 - pcbsd/trunk/system-overlay/usr/PCBSD/bin

[svn at pcbsd.org]

Author: kris
Date: 2010-04-01 11:43:11 -0700 (Thu, 01 Apr 2010)
New Revision: 6489

Modified:
   pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
Log:

Fixed up pdm, now you can always choose "X vesa mode" at the boot splash, and default to the 1024x768 vesa screen



Modified: pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm	2010-04-01 18:15:11 UTC (rev 6488)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/bin/pdm	2010-04-01 18:43:11 UTC (rev 6489)
@@ -23,9 +23,8 @@
 
 setup_xvesa() {
 	echo "Using failsafe VESA 1024x768 mode..." >/dev/console
-	rm /etc/X11/xorg.conf
+	mv /etc/X11/xorg.conf /etc/X11/xorg.conf.preVesa.backup
 	cp /usr/PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
-	rm -f/usr/PCBSD/conf/.runxsetup
 }
 
 # Check if we are going to re-run the display setup wizard
@@ -69,12 +68,13 @@
 while
 i=1
 do
+	# If the user wants to switch to failsafe X
+	if [ ${xvesa} = "YES" ]; then
+		setup_xvesa
+	fi
+
 	if [ -e "/usr/PCBSD/conf/.runxsetup" ]; then
-		if [ ${xvesa} = "YES" ]; then
-			setup_xvesa
-		else
-		    	setup_xorg
-		fi
+	    	setup_xorg
 	else
 		exec /usr/local/kde4/bin/kdm "$@"
 	fi