[PC-BSD Commits] r8143 - in pcbsd/current: src-qt4/pc-sysinstaller system-overlay/usr/local/etc/rc.d

[svn at pcbsd.org]

Author: kris
Date: 2010-12-04 09:39:42 -0800 (Sat, 04 Dec 2010)
New Revision: 8143

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
   pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm
Log:

Fixed a bug setting the trigger for the initial load of the xgui tool



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-04 17:11:00 UTC (rev 8142)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-04 17:39:42 UTC (rev 8143)
@@ -765,7 +765,7 @@
 
   // If this is a PC-BSD Install, do a few extra commands after everything else
   if ( radioInstallPCBSD->isChecked() ) {
-      cfgList << "runCommand=touch /var/run/.runxsetup";
+      cfgList << "runCommand=touch /var/.runxsetup";
       cfgList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/pcbsd/xorg-gui/conf/xorg.conf.basic";
       if (! radioUpgrade->isChecked() )
       	cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/reset-firewall";

Modified: pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm
===================================================================
--- pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm	2010-12-04 17:11:00 UTC (rev 8142)
+++ pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm	2010-12-04 17:39:42 UTC (rev 8143)
@@ -21,7 +21,7 @@
 
 setup_xorg() {
 	/usr/local/share/pcbsd/xorg-gui/bin/rundetect.sh
-	rm -f /var/run/.runxsetup
+	rm -f /var/.runxsetup
 }
 
 setup_xvesa() {
@@ -34,7 +34,7 @@
 y=`kenv runwiz 2>/dev/null`
 if [ $? -eq 0 ]; then
    if [ "$y" = "YES" ] ; then
-     touch /var/run/.runxsetup
+     touch /var/.runxsetup
    fi
    kenv -u runwiz
 fi
@@ -91,7 +91,7 @@
     fi
 
     # If the user wants to switch to run the xorg setup again
-    if [ -e "/var/run/.runxsetup" ]; then
+    if [ -e "/var/.runxsetup" ]; then
     	setup_xorg
     fi