Changeset b1457e5


Ignore:
Timestamp:
07/10/13 09:45:03 (23 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
1d2d46af, 4f9718b
Parents:
4018e43
Message:

Finish cleaning up the new shutdown procedure stuff for PCDM.

Location:
src-qt4/PCDM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    r68de35a rb1457e5  
    55 
    66#See if XDMCP support is enabled for logging in to this system 
    7 if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`"];  
     7if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`" ];  
    88then 
    99  # XDMCP is enabled 
    1010  echo "Starting PCDM XDMCP Server" 
    11   while [ 1 ]; do 
     11  while [ ! -e /var/run/nologin ]; do 
    1212    xinit /usr/local/bin/PCDM-session --once -- /usr/local/bin/X :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
    1313  done 
     
    1818  touch /tmp/.PCDMAUTOLOGINFILE 
    1919  # Now start the X Server 
    20   while [ 1 ]; do 
     20  while [ ! -e /var/run/nologin ]; do 
    2121    /usr/local/bin/pc-checkxdisplay 
    2222    xinit /usr/local/bin/PCDM-session --once -- :0   
  • src-qt4/PCDM/src/main.cpp

    r4018e43 rb1457e5  
    5454  } 
    5555  splash.show(); 
     56  QCoreApplication::processEvents(); //Process the splash screen event immediately 
    5657  //qDebug() << "SplashScreen Started:" << QString::number(clock.elapsed())+" ms"; 
    5758  //Initialize the xprocess 
     
    123124  desktop.waitForSessionClosed(); 
    124125  splash.show(); //show the splash screen again 
    125   splash.showMessage(QObject::tr("System Shutting Down")); 
     126  splash.showMessage(QObject::tr("System Shutting Down"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white); 
    126127  //check for shutdown process 
    127128  if(QFile::exists("/var/run/nologin")){ 
     
    158159  int retCode = runSingleSession(argc,argv); 
    159160  if(retCode != 0){ neverquit=FALSE; } 
    160   if( (retCode < 0) && QFile::exists("/var/run/nologin") ){  
    161     //Shutdown Process got hung up somewhere: force it now 
    162     //system("shutdown -p now"); 
    163   } 
    164161 } 
    165162 return 0; 
Note: See TracChangeset for help on using the changeset viewer.