[PC-BSD Commits] r353 - pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin

[svn at pcbsd.org]

Author: kris
Date: 2007-06-20 19:28:55 +0100 (Wed, 20 Jun 2007)
New Revision: 353

Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
Log:

Removed X auto-detect, since it was causing crashes on a few systems, and
on my laptop. Now the script promps the user to select a resolution, and 
test it like normal. 



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2007-06-20 18:00:18 UTC (rev 352)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh	2007-06-20 18:28:55 UTC (rev 353)
@@ -37,56 +37,59 @@
 
 
 # Check if we need to run the initial auto-detection wizard
-if [ ! -e "/PCBSD/xorg-gui/.skipauto" ]
-then
+#if [ ! -e "/PCBSD/xorg-gui/.skipauto" ]
+#then
 
 # Copy over the working xorg.conf file
-cp /PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
+#cp /PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
 
 ##### Create the xinitrc file
-echo '#!/bin/sh
-/usr/local/bin/fluxbox &
-PID=$!
-kdialog --msgbox "PC-BSD will now attempt to set your screen resolution.\nIf the screen fails to display, please wait 10 seconds, and you will be able to manually set the resolution."
-kill -9 ${PID}
-fi
-' > /root/.xinitrc
-chmod 755 /root/.xinitrc
+#echo '#!/bin/sh
+#/usr/local/bin/fluxbox &
+#PID=$!
+#kdialog --msgbox "PC-BSD will now attempt to set your screen resolution.\nIf the screen fails to display, please wait 10 seconds, and you will be able to manually set the resolution."
+#kill -9 ${PID}
+#fi
+#' > /root/.xinitrc
+#chmod 755 /root/.xinitrc
 
 ### Warn the user that we will attempt an auto-config
-/usr/local/bin/startx
+#/usr/local/bin/startx
 
-rm /etc/X11/xorg.conf
-/PCBSD/xorg-gui/autoDetect/x_config.sh
+#rm /etc/X11/xorg.conf
+#/PCBSD/xorg-gui/autoDetect/x_config.sh
 
 ##### Create the xinitrc file
-echo '#!/bin/sh
-/usr/local/bin/fluxbox &
-PID=$!
-/PCBSD/xorg-gui/bin/XGUI -test
-if [ "${?}" = "0" ]
-then
- echo "selected" > /PCBSD/xorg-gui/.selected
-fi
-kill -9 ${PID}
-' > /root/.xinitrc
-chmod 755 /root/.xinitrc
+#echo '#!/bin/sh
+#/usr/local/bin/fluxbox &
+#PID=$!
+#/PCBSD/xorg-gui/bin/XGUI -test
+#if [ "${?}" = "0" ]
+#then
+# echo "selected" > /PCBSD/xorg-gui/.selected
+#fi
+#kill -9 ${PID}
+#' > /root/.xinitrc
+#chmod 755 /root/.xinitrc
 
 ### Now test the new resolution
-/usr/local/bin/startx
+#/usr/local/bin/startx
 
-if [ -e "/PCBSD/xorg-gui/.selected" ]
-then
+#if [ -e "/PCBSD/xorg-gui/.selected" ]
+#then
 
   # Copy over the right ttys file now
-  cp /PCBSD/xorg-gui/conf/ttys.normal /etc/ttys
-  kill -HUP 1
+#  cp /PCBSD/xorg-gui/conf/ttys.normal /etc/ttys
+#  kill -HUP 1
 
-  exit
-fi
+#  exit
+#fi
 
-fi
+#fi
 
+
+# Run the setup wizard allowing user to select their own resolution
+
 while
 i=1
 do
@@ -119,6 +122,7 @@
 echo '#!/bin/sh
 /usr/local/bin/fluxbox &
 PID=$!
+kdialog --msgbox "PC-BSD will now allow you to setup your monitor resolution and video settings.\n If your system is equipped with a nVidia video card, you may wish to select the nvidia driver on the advanced tab. This will enable you to run the 3D desktop, Beryl."
 /PCBSD/xorg-gui/bin/XGUI
 kill -9 ${PID}
 if [ "$?" = "1" ]