[PC-BSD Commits] r8130 - in pcbsd/current/src-qt4/pc-xgui/resources: bin settings templates/scripts

[svn at pcbsd.org]

Author: kris
Date: 2010-12-02 08:09:53 -0800 (Thu, 02 Dec 2010)
New Revision: 8130

Removed:
   pcbsd/current/src-qt4/pc-xgui/resources/templates/scripts/nvidia.sh
Modified:
   pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
   pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
   pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.amd64
   pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.i386
Log:

Cleanup how the xgui handles the nvidia driver, since it'll be installed via meta-pkg now



Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-12-02 15:59:13 UTC (rev 8129)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-12-02 16:09:53 UTC (rev 8130)
@@ -43,6 +43,7 @@
    mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
 fi
 
+echo " " >/dev/console
 echo "Detecting video card and monitor capabilities..." >/dev/console
 X -configure 2>/dev/null
 
@@ -284,6 +285,4 @@
 rm ${XGUITMP}/.skipauto >/dev/null 2>/dev/null
 echo "Preparing to start the desktop..." >/dev/console
 sleep 1
-kill -HUP 1
-sleep 5 
 exit 0

Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2010-12-02 15:59:13 UTC (rev 8129)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2010-12-02 16:09:53 UTC (rev 8130)
@@ -262,40 +262,23 @@
 # Check if we need to remove any nvidia specific settings
 if [ "${DRIVER}" != "nvidia" ]
 then
+	#Check if the driver is already loaded
+	kldstat | grep nvidia >/dev/null 2>/dev/null
+	if [ "${?}" = "0" ] ; then kldunload nvidia ; fi
 
-#Check if the driver is already loaded
-kldstat | grep nvidia >/dev/null 2>/dev/null
-if [ "${?}" = "0" ]
-then
- # Its loaded, so remove the driver
- kldunload nvidia
- pkg_delete -f nvidia-driver* >/dev/null 2>/dev/null
- pkg_delete -f nvidia-settings* >/dev/null 2>/dev/null
- 
- # Remove the 32bit compat stuff as well
- if [ "`uname -m`" = "amd64" ]
- then
-   PKG_DBDIR="/var/db/pkg32" ; export PKG_DBDIR
-   pkg_delete -p /usr/local32 -f nvidia-driver* >/dev/null 2>/dev/null
-   PKG_DBDIR="" ; export PKG_DBDIR
- fi
-fi
+	cat /boot/loader.conf | grep nvidia_load >/dev/null 2>/dev/null
+	if [ "${?}" = "0" ] ; then
+  		cat /boot/loader.conf | grep -v 'nvidia_load' > /boot/loader.conf.new
+  		mv /boot/loader.conf.new /boot/loader.conf
+	fi
 
-cat /boot/loader.conf | grep nvidia_load >/dev/null 2>/dev/null
-if [ "${?}" = "0" ]
-then
-  cat /boot/loader.conf | grep -v 'nvidia_load' > /boot/loader.conf.new
-  mv /boot/loader.conf.new /boot/loader.conf
-fi
+	# Make sure we enable built-in AGP
+	cat /boot/device.hints | grep -v "hint.agp.0.disabled" >/tmp/.device.hints
+	mv /tmp/.device.hints /boot/device.hints
 
-# Make sure we enable built-in AGP
-cat /boot/device.hints | grep -v "hint.agp.0.disabled" >/tmp/.device.hints
-mv /tmp/.device.hints /boot/device.hints
+fi # End of nvidia driver not selected check
 
-# End of nvidia driver not selected check
-fi
 
-
 # See if this driver needs any post-setup operations to run
 if [ -e "${PROGDIR}/templates/scripts/${DRIVER}.sh" ]
 then

Modified: pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.amd64
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.amd64	2010-12-02 15:59:13 UTC (rev 8129)
+++ pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.amd64	2010-12-02 16:09:53 UTC (rev 8130)
@@ -19,7 +19,7 @@
 nouveau
 nsc
 nv
-nvidia-195.36.15
+nvidia
 r128
 radeonhd
 radeonhd-3d-enable

Modified: pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.i386
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.i386	2010-12-02 15:59:13 UTC (rev 8129)
+++ pcbsd/current/src-qt4/pc-xgui/resources/settings/drivers.txt.i386	2010-12-02 16:09:53 UTC (rev 8130)
@@ -19,9 +19,7 @@
 nouveau
 nsc
 nv
-nvidia-195.36.15
-nvidia-173.14.20
-nvidia-96.43.13
+nvidia
 r128
 radeonhd
 radeonhd-3d-enable