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

[svn at pcbsd.org]

Author: kris
Date: 2007-06-04 16:03:19 +0100 (Mon, 04 Jun 2007)
New Revision: 271

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

Changed the setupconf.sh file to not start beryl if not running 3d



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-06-03 11:20:58 UTC (rev 270)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/bin/setupconf.sh	2007-06-04 15:03:19 UTC (rev 271)
@@ -63,6 +63,8 @@
 if [ "${DRIVER}" = "nvidia" ]
 then
 
+rm /PCBSD/conf/beryl-enable
+
 #Check if the driver is already loaded
 kldstat | grep nvidia >/dev/null 2>/dev/null
 if [ "${?}" != "0" ]
@@ -81,6 +83,8 @@
 # If the user didn't select nVidia driver, make sure its not loaded
 else
 
+rm /PCBSD/conf/beryl-enable
+
 #Check if the driver is already loaded
 kldstat | grep nvidia >/dev/null 2>/dev/null
 if [ "${?}" = "0" ]