[PC-BSD Commits] r22071 - in pcbsd-projects/PCDM: . rc.d

svn at pcbsd.org svn at pcbsd.org
Fri Apr 5 05:37:27 PDT 2013


Author: kenmoore
Date: 2013-04-05 12:37:27 +0000 (Fri, 05 Apr 2013)
New Revision: 22071

Modified:
   pcbsd-projects/PCDM/PCDMd
   pcbsd-projects/PCDM/rc.d/pcdm
Log:
Remove the stuff in pc-checkxdisplay from the PCDM rc.d script, and run pc-checkxdisplay between each PCDM session (in PCDMd)



Modified: pcbsd-projects/PCDM/PCDMd
===================================================================
--- pcbsd-projects/PCDM/PCDMd	2013-04-05 12:31:13 UTC (rev 22070)
+++ pcbsd-projects/PCDM/PCDMd	2013-04-05 12:37:27 UTC (rev 22071)
@@ -10,10 +10,15 @@
   xinit -- /usr/local/bin/PCDM-session :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST}
 else
   # No XDMCP support
-
+  
+  
+  /usr/local/bin/pc-checkxdisplay #Run PC-BSD X display check
+  
   # Allow Auto-Login the first time PCDM starts
   xinit /usr/local/bin/PCDM-session -AutoLogin -- :0
   while [ 1 ]; do
+    /usr/local/bin/pc-checkxdisplay #Run PC-BSD X display check between sessions
+    
     # Always return to PCDM after a logout (prevent root shell opening)
     xinit /usr/local/bin/PCDM-session -- :0
   done

Modified: pcbsd-projects/PCDM/rc.d/pcdm
===================================================================
--- pcbsd-projects/PCDM/rc.d/pcdm	2013-04-05 12:31:13 UTC (rev 22070)
+++ pcbsd-projects/PCDM/rc.d/pcdm	2013-04-05 12:37:27 UTC (rev 22071)
@@ -12,37 +12,6 @@
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
-setup_xorg() {
-	/usr/local/share/pcbsd/xorg-gui/bin/rundetect.sh
-	rm -f /var/.runxsetup
-}
-
-setup_firstboot() {
-	/usr/local/bin/pc-firstgui
-        rm /var/.pcbsd-firstgui
-}
-
-setup_xvesa() {
-	echo "Using failsafe VESA 1024x768 mode..." >/dev/console
-	mv /etc/X11/xorg.conf /etc/X11/xorg.conf.preVesa.backup
-	cp /usr/local/share/pcbsd/xorg-gui/cardDetect/XF86Config.compat /etc/X11/xorg.conf
-}
-
-# Check if we are going to re-run the display setup wizard
-y=`kenv runwiz 2>/dev/null`
-if [ $? -eq 0 ]; then
-   if [ "$y" = "YES" ] ; then
-     touch /var/.runxsetup
-   fi
-   kenv -u runwiz
-fi
-
-xvesa="NO"
-v=`kenv xvesa 2>/dev/null`
-if [ $? -eq 0 ]; then
-   xvesa=$v
-fi
-
 name="pcdm"
 rcvar=pcdm_enable
 command="/usr/local/sbin/PCDMd"
@@ -58,23 +27,8 @@
     if ! checkyesno pcdm_enable ; then
 	return 0
     fi
-    echo "Starting PCDM login daemon."
+    echo "Starting PCDM."
 
-    # If the user wants to switch to failsafe X
-    if [ ${xvesa} = "YES" ]; then
-	setup_xvesa
-    fi
-
-    # If the user wants to switch to run the xorg setup again
-    if [ -e "/var/.runxsetup" ]; then
-    	setup_xorg
-    fi
-
-    # Check if we need to do a first boot setup
-    if [ -e "/var/.pcbsd-firstgui" ]; then
-       setup_firstboot
-    fi
-
     #Start the PCDM login daemon
     ${command} ${pcdm_flags} 
   ) &



More information about the Commits mailing list