[PC-BSD Commits] r20209 - pcbsd/branches/9.1/src-qt4/pc-xgui/resources/bin

[svn at pcbsd.org]

Author: kris
Date: 2012-11-13 15:41:23 +0000 (Tue, 13 Nov 2012)
New Revision: 20209

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

MFC the fixes to XGUI console output



Modified: pcbsd/branches/9.1/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/branches/9.1/src-qt4/pc-xgui/resources/bin/rundetect.sh	2012-11-13 15:40:50 UTC (rev 20208)
+++ pcbsd/branches/9.1/src-qt4/pc-xgui/resources/bin/rundetect.sh	2012-11-13 15:41:23 UTC (rev 20209)
@@ -115,6 +115,7 @@
 
     # Check if user requested to run in vesa mode specifically and do it
     if [ "$xvesa" = "YES" ] ; then
+      echo "`clear`" >/dev/console
       echo "Using failsafe VESA 1024x768 mode..." >/dev/console
       cp ${PROGDIR}/cardDetect/XF86Config.compat /etc/X11/xorg.conf
     else
@@ -138,6 +139,7 @@
   elif [ "${ATTEMPT}" = "1" ] ; then
     # Try running the driver detection again
     rm /etc/X11/xorg.conf
+    echo "`clear`" >/dev/console
     echo "Saved configuration failed... Running failsafe-detect..." >/dev/console
     X -configure >/dev/null 2>&1
     # Copy over the new xorg.conf
@@ -151,6 +153,7 @@
 
   else
     # Still failed, drop to VESA failsafe
+    echo "`clear`" >/dev/console
     echo "Detected settings failed... Using failsafe VESA 1024x768 mode..." >/dev/console
     rm /etc/X11/xorg.conf
     cp ${PROGDIR}/cardDetect/XF86Config.compat /etc/X11/xorg.conf
@@ -176,6 +179,7 @@
     chmod 755 /root/.xinitrc
   fi
 
+  echo "`clear`" >/dev/console
   echo "Please wait... Starting X..." >/dev/console
   sleep 1
   # Start the X gui
@@ -190,6 +194,7 @@
     rm ${XGUITMP}/.selected >/dev/null 2>/dev/null
 
     #### Create the new XF86Config file with the user settings
+    echo "`clear`" >/dev/console
     echo "Generating new Xorg configuration file..." >/dev/console
     ${PROGDIR}/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
 
@@ -197,6 +202,7 @@
     cp ${PROGDIR}/scripts/xinit-check /root/.xinitrc
     chmod 755 /root/.xinitrc
 
+    echo "`clear`" >/dev/console
     echo "Please wait... Starting X..." >/dev/console
     sleep 1
     /usr/local/bin/startx 2>>${XLOG}
@@ -243,6 +249,7 @@
 
 rm ${XGUITMP}/.rerunxsetup >/dev/null 2>/dev/null
 rm ${XGUITMP}/.skipauto >/dev/null 2>/dev/null
+echo "`clear`" >/dev/console
 echo "Preparing to start the desktop..." >/dev/console
 sleep 1
 exit 0