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

svn at pcbsd.org svn at pcbsd.org
Tue Nov 30 13:55:12 PST 2010


Author: kris
Date: 2010-11-30 13:55:12 -0800 (Tue, 30 Nov 2010)
New Revision: 8103

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

Updated how we trigger the xsetup tool



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-11-30 21:04:51 UTC (rev 8102)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-11-30 21:55:12 UTC (rev 8103)
@@ -765,7 +765,7 @@
 
   // If this is a PC-BSD Install, do a few extra commands after everything else
   if ( radioInstallPCBSD->isChecked() ) {
-      cfgList << "runCommand=cp /usr/local/share/pcbsd/xorg-gui/conf/ttys.xsetup /etc/ttys";
+      cfgList << "runCommand=touch /var/run/.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/src-sh/pc-runxgui/pc-runxgui
===================================================================
--- pcbsd/current/src-sh/pc-runxgui/pc-runxgui	2010-11-30 21:04:51 UTC (rev 8102)
+++ pcbsd/current/src-sh/pc-runxgui/pc-runxgui	2010-11-30 21:55:12 UTC (rev 8103)
@@ -4,11 +4,11 @@
 # Comment: Script to kill X / KDM and start xgui
 ########################################################
 
-echo "RUNX" > /tmp/.runxsetup
+echo "RUNX" > /var/run/.runxsetup
 
 xPid=`ps -auwwx | grep '/usr/local/bin/X' | grep -v 'grep' | tr -s ' ' | cut -d ' ' -f 2`
-kPid=`ps -auwwx | grep '/usr/local/bin/kdm-bin' | grep -v 'grep' | tr -s ' ' | cut -d ' ' -f 2`
-kPid2=`ps -auwwx | grep 'kdm-bin' | grep -v '/usr/local' |grep -v 'grep' | tr -s ' ' | cut -d ' ' -f 2`
+kPid=`ps -auwwx | grep '/usr/local/libexec/gdm-simgle-slave' | grep -v 'grep' | tr -s ' ' | cut -d ' ' -f 2`
+kPid2=`ps -auwwx | grep 'gdm-binary' | grep -v '/usr/local' |grep -v 'grep' | tr -s ' ' | cut -d ' ' -f 2`
 
 sync
 

Modified: pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm
===================================================================
--- pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm	2010-11-30 21:04:51 UTC (rev 8102)
+++ pcbsd/current/system-overlay/usr/local/etc/rc.d/gdm	2010-11-30 21:55:12 UTC (rev 8103)
@@ -21,7 +21,7 @@
 
 setup_xorg() {
 	/usr/local/share/pcbsd/xorg-gui/bin/rundetect.sh
-	rm -f /tmp/.runxsetup
+	rm -f /var/run/.runxsetup
 }
 
 setup_xvesa() {
@@ -34,7 +34,7 @@
 y=`kenv runwiz 2>/dev/null`
 if [ $? -eq 0 ]; then
    if [ "$y" = "YES" ] ; then
-     touch /tmp/.runxsetup
+     touch /var/run/.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 "/tmp/.runxsetup" ]; then
+    if [ -e "/var/run/.runxsetup" ]; then
     	setup_xorg
     fi
 



More information about the Commits mailing list