[PC-BSD Commits] r18472 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-08-17 14:40:33 +0000 (Fri, 17 Aug 2012)
New Revision: 18472

Modified:
   pcbsd-projects/PCDM/PCDM.pro
   pcbsd-projects/PCDM/pcdm-backend.cpp
   pcbsd-projects/PCDM/startPCDM
Log:
Make a couple changes to the PCDM startup process to try and get the login procedure working



Modified: pcbsd-projects/PCDM/PCDM.pro
===================================================================
--- pcbsd-projects/PCDM/PCDM.pro	2012-08-17 14:23:06 UTC (rev 18471)
+++ pcbsd-projects/PCDM/PCDM.pro	2012-08-17 14:40:33 UTC (rev 18472)
@@ -1,6 +1,6 @@
 
 TARGET = PCDM
-TARGET.path=/usr/local/bin
+target.path=/usr/local/bin
 TEMPLATE = app
 LIBS += -lpcbsd -lpam
 SOURCES += main.cpp \
@@ -95,6 +95,6 @@
 scripts.path = /usr/local/bin
 scripts.files = startPCDM
 
-INSTALLS += scripts dotrans TARGET
+INSTALLS += scripts dotrans target
 
 RESOURCES += PCDM.qrc

Modified: pcbsd-projects/PCDM/pcdm-backend.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-backend.cpp	2012-08-17 14:23:06 UTC (rev 18471)
+++ pcbsd-projects/PCDM/pcdm-backend.cpp	2012-08-17 14:40:33 UTC (rev 18472)
@@ -68,7 +68,7 @@
   if(allowed){
     qDebug() << "Username/Password Authorized";
     //Setup the system command to run the selected DE
-    QString cmd = "su - "+username+" -c "+xBinary;
+    QString cmd = "su -m "+username+" -c "+xBinary;
     startXSession(cmd);
   }else{
     qDebug() << "Username/Password not authorized";	  

Modified: pcbsd-projects/PCDM/startPCDM
===================================================================
--- pcbsd-projects/PCDM/startPCDM	2012-08-17 14:23:06 UTC (rev 18471)
+++ pcbsd-projects/PCDM/startPCDM	2012-08-17 14:40:33 UTC (rev 18472)
@@ -1,8 +1,12 @@
 #!/bin/sh
 
-#Setup the PCDM startup sequence
-xinit /usr/local/bin/PCDM
+#Start the normal PCDM GUI
+xinit /usr/local/bin/PCDM :8
+#Kill the x session ons the PCDM GUI  is done
+xkill -display :8
 
+#If a desktop session command has been created, run it then remove it
 if [ -f /usr/local/bin/.pcdm-startup ]; then
   sh /usr/local/bin/.pcdm-startup
+  rm /usr/local/bin/.pcdm-startup
 fi