[PC-BSD Commits] r7977 - in pcbsd/current: src-sh src-sh/pc-runxgui system-overlay/usr/local/bin

[svn at pcbsd.org]

Author: kris
Date: 2010-11-03 17:19:59 -0700 (Wed, 03 Nov 2010)
New Revision: 7977

Added:
   pcbsd/current/src-sh/pc-runxgui/
   pcbsd/current/src-sh/pc-runxgui/Makefile
   pcbsd/current/src-sh/pc-runxgui/pc-runxgui
Modified:
   pcbsd/current/src-sh/Makefile
   pcbsd/current/system-overlay/usr/local/bin/pdm
Log:

Added command 'pc-runxgui' which can be called when we want to kill the current
session and re-run the display setup wizard



Modified: pcbsd/current/src-sh/Makefile
===================================================================
--- pcbsd/current/src-sh/Makefile	2010-11-03 17:33:14 UTC (rev 7976)
+++ pcbsd/current/src-sh/Makefile	2010-11-04 00:19:59 UTC (rev 7977)
@@ -21,6 +21,7 @@
 MKDIR         = mkdir -p
 SUBTARGETS    =  \
 		sub-pcsu \
+		sub-pcrunx \
 		sub-pcswap \
 		sub-pbi \
 		sub-meta \
@@ -52,6 +53,19 @@
 sub-pcsu-install_subtargets: pc-su/$(MAKEFILE) FORCE
 	cd pc-su/ && $(MAKE) -f $(MAKEFILE) install
 
+sub-pcrunx: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE)
+sub-pcrunx-make_default: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE) 
+sub-pcrunx-make_first: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE) first
+sub-pcrunx-all: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE) all
+sub-pcrunx-clean: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE) clean
+sub-pcrunx-install_subtargets: pc-runxgui/$(MAKEFILE) FORCE
+	cd pc-runxgui/ && $(MAKE) -f $(MAKEFILE) install
+
 sub-pcswap: pc-swapmonitor/$(MAKEFILE) FORCE
 	cd pc-swapmonitor/ && $(MAKE) -f $(MAKEFILE)
 sub-pcswap-make_default: pc-swapmonitor/$(MAKEFILE) FORCE
@@ -93,6 +107,7 @@
 
 make_default: sub-pbi-make_default \
 	sub-meta-make_default \
+	sub-pcrunx-make_default \
 	sub-pcsu-make_default \
 	sub-pcswap-make_default \
 	sub-xdgutil-make_default \
@@ -100,6 +115,7 @@
 
 make_first: sub-pbi-make_first \
 	sub-meta-make_first \
+	sub-pcrunx-make_first \
 	sub-pcsu-make_first \
 	sub-pcswap-make_first \
 	sub-xdgutil-make_first \
@@ -107,6 +123,7 @@
 
 all: sub-pbi-all \
 	sub-meta-all \
+	sub-pcrunx-all \
 	sub-pcsu-all \
 	sub-pcswap-all \
 	sub-xdgutil-all \
@@ -114,6 +131,7 @@
 
 clean: sub-pbi-clean \
 	sub-meta-clean \
+	sub-pcrunx-clean \
 	sub-pcsu-clean \
 	sub-pcswap-clean \
 	sub-xdgutil-clean \
@@ -121,6 +139,7 @@
 
 install_subtargets: sub-pbi-install_subtargets \
 	sub-meta-install_subtargets \
+	sub-pcrunx-install_subtargets \
 	sub-pcsu-install_subtargets \
 	sub-pcswap-install_subtargets \
 	sub-xdgutil-install_subtargets \

Modified: pcbsd/current/system-overlay/usr/local/bin/pdm
===================================================================
--- pcbsd/current/system-overlay/usr/local/bin/pdm	2010-11-03 17:33:14 UTC (rev 7976)
+++ pcbsd/current/system-overlay/usr/local/bin/pdm	2010-11-04 00:19:59 UTC (rev 7977)
@@ -8,7 +8,7 @@
 export PATH
 
 setup_xorg() {
-	/usr/local/share/pcbsd/xorg-gui/resources/bin/rundetect.sh
+	/usr/local/share/pcbsd/xorg-gui/bin/rundetect.sh
 	rm -f /tmp/.runxsetup
 }
 
@@ -55,21 +55,14 @@
    fi
 fi
 
-# Start our loop
-while
-i=1
-do
-	# If the user wants to switch to failsafe X
-	if [ ${xvesa} = "YES" ]; then
-		setup_xvesa
-	fi
+# If the user wants to switch to failsafe X
+if [ ${xvesa} = "YES" ]; then
+	setup_xvesa
+fi
 
-	if [ -e "/tmp/.runxsetup" ]; then
-	    	setup_xorg
-	else
-		exec /usr/local/bin/kdm "$@"
-	fi
+if [ -e "/tmp/.runxsetup" ]; then
+    	setup_xorg
+else
+	exec /usr/local/bin/kdm "$@"
+fi
 
-sleep 2
-
-done