[PC-BSD Commits] r485 - in pcbsd/trunk/system-overlay: PCBSD/bin PCBSD/xorg-gui PCBSD/xorg-gui/bin PCBSD/xorg-gui/cardDetect PCBSD/xorg-gui/templates/header boot
svn at pcbsd.org
svn at pcbsd.org
Sun Jul 15 14:47:56 PDT 2007
Author: kris
Date: 2007-07-15 22:47:55 +0100 (Sun, 15 Jul 2007)
New Revision: 485
Added:
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.vmware
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-100.14.11.xorg.conf
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-9746.xorg.conf
Modified:
pcbsd/trunk/system-overlay/PCBSD/bin/pdm
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
pcbsd/trunk/system-overlay/boot/beastie.4th
Log:
Big update, changes XGUI setup script to always echo to /dev/console, even
when started from working desktop. Also added options to run the setup
wizard from the text loader menu.
Fixed missing headers for NVIDIA drivers so that GLX is enabled properly
now.
Added features so that if user changes video card or monitor, and for some
reason the saved xorg.conf from install CD isn't working, a new one will
be auto-generated. If that fails, then it will make a last attempt with
VESA mode.
Modified: pcbsd/trunk/system-overlay/PCBSD/bin/pdm
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/bin/pdm 2007-07-15 14:20:52 UTC (rev 484)
+++ pcbsd/trunk/system-overlay/PCBSD/bin/pdm 2007-07-15 21:47:55 UTC (rev 485)
@@ -4,8 +4,10 @@
###############################################################################
# Check if the user wanted to run the xorg-gui at the loader menu
-/sbin/sysctl -a | /usr/bin/grep kern.module_path | /usr/bin/grep PCBSD
-if [ "$?" = "0" ]
+sleep 1
+/sbin/sysctl kern.module_path | /usr/bin/grep "RUNXWIZ" >/dev/null 2>/dev/null
+FOUND="$?"
+if [ "$FOUND" = "0" ]
then
/usr/bin/touch /PCBSD/conf/.runxsetup
fi
Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh 2007-07-15 14:20:52 UTC (rev 484)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/rundetect.sh 2007-07-15 21:47:55 UTC (rev 485)
@@ -19,9 +19,9 @@
###############################################################################
# Start the script now
-clear
+echo "`clear`" >/dev/console
-echo "Please wait... Start X-Configuration Utility"
+echo "Please wait... Start X-Configuration Utility" >/dev/console
# Check if we need to save an existing .xinitrc file
if [ -e "/root/.xinitrc" ]
@@ -62,6 +62,10 @@
rm /PCBSD/xorg-gui/.canceled >/dev/null 2>/dev/null
rm /PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
+
+# Set the attempt number to 0
+ATTEMPT="0"
+
###############################################################################
# Start the detection loop
@@ -69,9 +73,25 @@
i=1
do
-# Copy over the working xorg.conf file
-cp /PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
+if [ "${ATTEMPT}" = "0" ]
+then
+ # Use the saved xorg.conf.basic file
+ echo "Using saved /PCBSD/xorg-gui/conf/xorg.conf.basic from install..." >/dev/console
+ cp /PCBSD/xorg-gui/conf/xorg.conf.basic /etc/X11/xorg.conf
+elif [ "${ATTEMPT}" = "1" ]
+then
+ # Try running the driver detection again
+ rm /etc/X11/xorg.conf
+ echo "Saved configuration failed... Running auto-detect..." >/dev/console
+ /PCBSD/xorg-gui/cardDetect/x_config.sh
+else
+ # Still failed, drop to VESA failsafe
+ echo "Auto-detected settings failed... Using failsafe VESA 1024x768 mode..." >/dev/console
+ rm /etc/X11/xorg.conf
+ cp /PCBSD/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
+fi
+
# Check if the previous attempt failed
if [ -e "/PCBSD/xorg-gui/.failed" ]
then
@@ -79,6 +99,7 @@
##### Create the xinitrc file
echo '#!/bin/sh
+touch /PCBSD/xorg-gui/.xstartupsuccess
/usr/local/bin/fluxbox &
PID=$!
kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
@@ -95,6 +116,7 @@
##### Create the xinitrc file
echo '#!/bin/sh
+touch /PCBSD/xorg-gui/.xstartupsuccess
/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 3D card, please select the appropriate driver from the 'Advanced' tab. This will enable you to run the 3D desktop, Beryl.\n\nNOTE: Beryl requires a color depth of 24."
@@ -111,12 +133,13 @@
fi
-echo "Please wait... Starting X..."
+echo "Please wait... Starting X..." >/dev/console
sleep 1
# Start the X gui
/usr/local/bin/startx 2>>${XLOG}
+
# The user canceled the dialog, and chose to use the default
if [ -e "/PCBSD/xorg-gui/.canceled" ]
then
@@ -130,7 +153,7 @@
rm /PCBSD/xorg-gui/.selected >/dev/null 2>/dev/null
#### Create the new XF86Config file with the user settings
-echo "Generating new Xorg configuration file..."
+echo "Generating new Xorg configuration file..." >/dev/console
/PCBSD/xorg-gui/bin/setupconf.sh >>${XLOG} 2>>${XLOG}
##### Create the xinitrc file
@@ -146,7 +169,7 @@
' > /root/.xinitrc
chmod 755 /root/.xinitrc
-echo "Please wait... Starting X..."
+echo "Please wait... Starting X..." >/dev/console
sleep 1
/usr/local/bin/startx 2>>${XLOG}
@@ -159,6 +182,18 @@
echo "failed" > /PCBSD/xorg-gui/.failed
fi
+# Check if the X startup was a success
+if [ ! -e "/PCBSD/xorg-gui/.xstartupsuccess" ]
+then
+ ATTEMPT="`expr $ATTEMPT + 1`"
+ rm /PCBSD/xorg-gui/.failed
+else
+ rm /PCBSD/xorg-gui/.xstartupsuccess
+fi
+
+# Removed any saved settings file
+rm /PCBSD/xorg-gui/.xsettings.sh
+
done
@@ -180,7 +215,7 @@
fi
rm /PCBSD/xorg-gui/.skipauto >/dev/null 2>/dev/null
-echo "Preparing to start the desktop..."
+echo "Preparing to start the desktop..." >/dev/console
sleep 1
kill -HUP 1
sleep 5
Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh 2007-07-15 14:20:52 UTC (rev 484)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh 2007-07-15 21:47:55 UTC (rev 485)
@@ -116,3 +116,10 @@
# We found the file, so run it
sh "/PCBSD/xorg-gui/templates/scripts/${SELDRIVER}.sh"
fi
+
+# One final check to make sure we are using a depth of 24bit to enable beryl
+if [ "${DEPTH}" != "24" ]
+then
+ rm /PCBSD/conf/beryl-enable
+fi
+
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.vmware
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh
Property changes on: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/x_config.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-100.14.11.xorg.conf
Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia-9746.xorg.conf
Modified: pcbsd/trunk/system-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/system-overlay/boot/beastie.4th 2007-07-15 14:20:52 UTC (rev 484)
+++ pcbsd/trunk/system-overlay/boot/beastie.4th 2007-07-15 21:47:55 UTC (rev 485)
@@ -95,19 +95,16 @@
;
: fbsdbw-logo ( x y -- )
- 2dup at-xy ." ______" 1+
- 2dup at-xy ." | ____| __ ___ ___ " 1+
- 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+
- 2dup at-xy ." | __|| | | __/ __/" 1+
- 2dup at-xy ." | | | | | | |" 1+
- 2dup at-xy ." |_| |_| \___|\___|" 1+
- 2dup at-xy ." ____ _____ _____" 1+
- 2dup at-xy ." | _ \ / ____| __ \" 1+
- 2dup at-xy ." | |_) | (___ | | | |" 1+
- 2dup at-xy ." | _ < \___ \| | | |" 1+
- 2dup at-xy ." | |_) |____) | |__| |" 1+
- 2dup at-xy ." | | | |" 1+
- at-xy ." |____/|_____/|_____/"
+ 2dup at-xy ." ____ ______" 1+
+ 2dup at-xy ." / __ \/ ____/" 1+
+ 2dup at-xy ." / /_/ / /" 1+
+ 2dup at-xy ." / ____/ /___" 1+
+ 2dup at-xy ." /_/ \____/" 1+
+ 2dup at-xy ." ____ _____ ____" 1+
+ 2dup at-xy ." / __ ) ___// __ \" 1+
+ 2dup at-xy ." / __ \__ \/ / / /" 1+
+ 2dup at-xy ." / /_/ /__/ / /_/ /" 1+
+ at-xy ." /_____/____/_____/"
;
: print-logo ( x y -- )
@@ -179,11 +176,11 @@
clear
46 4 print-logo
42 20 2 2 box
- 13 6 at-xy ." Welcome to FreeBSD!"
- printmenuitem ." Boot FreeBSD [default]" bootkey !
+ 13 6 at-xy ." Welcome to PC-BSD!"
+ printmenuitem ." Boot PC-BSD [default]" bootkey !
s" arch-i386" environment? if
drop
- printmenuitem ." Boot FreeBSD with ACPI " bootacpikey !
+ printmenuitem ." Boot PC-BSD with ACPI " bootacpikey !
acpienabled? if
." disabled"
else
@@ -192,9 +189,9 @@
else
-2 bootacpikey !
then
- printmenuitem ." Boot FreeBSD in Safe Mode" bootsafekey !
- printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey !
- printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey !
+ printmenuitem ." Boot PC-BSD in Safe Mode" bootsafekey !
+ printmenuitem ." Boot PC-BSD in single user mode" bootsinglekey !
+ printmenuitem ." Boot PC-BSD with verbose logging" bootverbosekey !
printmenuitem ." Run the Display Setup Wizard" rundisplaywiz !
printmenuitem ." Escape to loader prompt" escapekey !
printmenuitem ." Reboot" rebootkey !
@@ -282,7 +279,7 @@
0 boot
then
dup rundisplaywiz @ = if
- s" /boot/kernel;/boot/modules;/PCBSD/xorg-gui" s" module_path" setenv
+ s" /boot/kernel;/boot/modules;/RUNXWIZ/" s" module_path" setenv
0 boot
then
dup bootsinglekey @ = if
More information about the Commits
mailing list