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

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-09-21 15:53:37 +0000 (Fri, 21 Sep 2012)
New Revision: 19431

Modified:
   pcbsd-projects/PCDM/PCDM-multi
   pcbsd-projects/PCDM/main.cpp
Log:
Start cleaning up the PCDM wrapper daemon



Modified: pcbsd-projects/PCDM/PCDM-multi
===================================================================
--- pcbsd-projects/PCDM/PCDM-multi	2012-09-21 09:18:27 UTC (rev 19430)
+++ pcbsd-projects/PCDM/PCDM-multi	2012-09-21 15:53:37 UTC (rev 19431)
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Allow Auto-Login the first time PCDM starts
+xinit "/usr/local/bin/PCDM-single -AutoLogin" -- :0
 while [ 1 ]; do
-  xinit /usr/local/bin/PCDM-single -- :0
+  # Always return to PCDM after a logout (prevent root shell opening)
+  xinit "/usr/local/bin/PCDM-single" -- :0
 done

Modified: pcbsd-projects/PCDM/main.cpp
===================================================================
--- pcbsd-projects/PCDM/main.cpp	2012-09-21 09:18:27 UTC (rev 19430)
+++ pcbsd-projects/PCDM/main.cpp	2012-09-21 15:53:37 UTC (rev 19431)
@@ -4,6 +4,7 @@
 #include <QDesktopWidget>
 #include <QFile>
 #include <QSplashScreen>
+#include <QDebug>
 
 #include "pcdm-themes.h"
 #include "pcdm-gui.h"
@@ -15,6 +16,7 @@
 int main(int argc, char *argv[])
 {
 
+  qDebug() << "argc:"<< argc << "argv" << argv;
   int returnCode;  
   Backend::checkLocalDirs();  // Create and fill "/usr/local/share/PCDM" if needed
   Backend::openLogFile("/usr/local/share/PCDM/PCDM.log");