[PC-BSD Commits] r676 - in pcbsd/trunk/system-overlay/PCBSD/xorg-gui: bin templates/scripts

[svn at pcbsd.org]

Author: kris
Date: 2007-09-06 08:51:26 -0700 (Thu, 06 Sep 2007)
New Revision: 676

Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-100.14.11.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-7184.sh
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-9746.sh
Log:

Setup the XGUI to install the nvidia-settings package when using the nvidia
driver



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-09-06 15:45:39 UTC (rev 675)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-09-06 15:51:26 UTC (rev 676)
@@ -87,6 +87,7 @@
  # 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
 fi
 
 cat /boot/loader.conf | grep nvidia_load >/dev/null 2>/dev/null

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-100.14.11.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-100.14.11.sh	2007-09-06 15:45:39 UTC (rev 675)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-100.14.11.sh	2007-09-06 15:51:26 UTC (rev 676)
@@ -16,6 +16,7 @@
 
 # Add the nvidia driver to the system
 pkg_add -f /PCBSD/packages/nvidia-driver-1.0.1001411.tbz
+pkg_add -f /PCBSD/packages/nvidia-settings*.tbz
 
 # Enable the beryl auto-start
 touch /PCBSD/conf/beryl-enable

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-7184.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-7184.sh	2007-09-06 15:45:39 UTC (rev 675)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-7184.sh	2007-09-06 15:51:26 UTC (rev 676)
@@ -16,6 +16,7 @@
 
 # Add the nvidia driver to the system
 pkg_add -f /PCBSD/packages/nvidia-driver-1.0.7184_5.tbz
+pkg_add -f /PCBSD/packages/nvidia-settings*.tbz
 
 # Enable the beryl auto-start
 touch /PCBSD/conf/beryl-enable

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-9746.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-9746.sh	2007-09-06 15:45:39 UTC (rev 675)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/scripts/nvidia-9746.sh	2007-09-06 15:51:26 UTC (rev 676)
@@ -16,6 +16,7 @@
 
 # Add the nvidia driver to the system
 pkg_add -f /PCBSD/packages/nvidia-driver-1.0.9746_5.tbz
+pkg_add -f /PCBSD/packages/nvidia-settings*.tbz
 
 # Enable the beryl auto-start
 touch /PCBSD/conf/beryl-enable