Changeset 6e8238f for src-qt4/PCDM/PCDMd


Ignore:
Timestamp:
07/02/13 08:37:45 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
796a591
Parents:
ab9281c
git-author:
Ken Moore <ken@…> (07/02/13 08:36:52)
git-committer:
Ken Moore <ken@…> (07/02/13 08:37:45)
Message:

Clean up the PCDM autostart functionality a bit, as well as the restart daemon

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    r1620346 r6e8238f  
    55 
    66#See if XDMCP support is enabled for logging in to this system 
    7 if [ "`cat /usr/local/share/PCDM/pcdm.conf | grep ALLOW_REMOTE_LOGIN=TRUE`" -eq "" ]; then 
     7if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`"];  
     8then 
    89  # XDMCP is enabled 
    9    
    10   xinit -- /usr/local/bin/PCDM-session :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
     10  echo "Starting PCDM XDMCP Server" 
     11  while [ 1 ]; do 
     12    xinit /usr/local/bin/PCDM-session -- /usr/local/bin/X :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
     13  done 
    1114else 
    1215  # No XDMCP support 
    13    
    14    
    15   /usr/local/bin/pc-checkxdisplay #Run PC-BSD X display check 
    16    
     16 
    1717  # Allow Auto-Login the first time PCDM starts 
    18   xinit /usr/local/bin/PCDM-session -AutoLogin -- :0 
     18  touch /tmp/.PCDMAUTOLOGINFILE 
     19  # Now start the X Server 
    1920  while [ 1 ]; do 
    20     /usr/local/bin/pc-checkxdisplay #Run PC-BSD X display check between sessions 
    21      
    22     # Always return to PCDM after a logout (prevent root shell opening) 
    23     xinit /usr/local/bin/PCDM-session -- :0 
     21    /usr/local/bin/pc-checkxdisplay 
     22    xinit /usr/local/bin/PCDM-session -- :0   
    2423  done 
    25    
    2624fi 
    2725         
Note: See TracChangeset for help on using the changeset viewer.