Changeset d5549e0


Ignore:
Timestamp:
10/31/13 09:56:20 (12 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:
5c669f07
Parents:
ef8b856
Message:

Move the xauth commands to when the xserver is not currently running and see if this lets it work

Location:
src-qt4/PCDM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    r8bf8f02 rd5549e0  
    4747  fi 
    4848  setenv XAUTHORITY ${PCDMAUTHFILE} 
     49  xauth -f ${PCDMAUTHFILE} generate :0 . 
    4950  xinit /usr/local/bin/PCDM-session --once -- :0 -auth ${PCDMAUTHFILE} $XOPTS 
     51  xauth -f ${PCDMAUTHFILE} remove :0 
    5052done 
  • src-qt4/PCDM/src/main.cpp

    r4e655ec rd5549e0  
    173173  if(runonce){ neverquit = FALSE; } 
    174174  qDebug() << " -- PCDM Session Starting..."; 
    175   system("xauth -f "+TMPAUTHFILE.toUtf8()+" generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol 
     175  //system("xauth -f "+TMPAUTHFILE.toUtf8()+" generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol 
    176176  //MIT-MAGIC-COOKIE-1 is good enough for our purposes since it is a single-user graphical system with no XDMCP 
    177177  int sid = -1; 
     
    200200  if(QFile::exists("/var/run/nologin")){ neverquit = FALSE; }  
    201201 } 
    202  system("xauth -f "+TMPAUTHFILE.toUtf8()+" remove :0"); 
     202 //system("xauth -f "+TMPAUTHFILE.toUtf8()+" remove :0"); 
    203203 return 0; 
    204204} 
Note: See TracChangeset for help on using the changeset viewer.