Changeset bdb9007


Ignore:
Timestamp:
12/05/13 10:02:55 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
26e5e91, bac293d
Parents:
549d441 (diff), 1baff968 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/main.cpp

    r8877013 r17486a8  
    155155  } 
    156156  //check for shutdown process 
    157   if(QFile::exists("/var/run/nologin") || retCode > 0){ 
     157  if( system("pgrep shutdown") == 0 || retCode > 0){ 
    158158    splash.showMessage(QObject::tr("System Shutting Down"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white); 
    159159    QCoreApplication::processEvents(); 
  • src-sh/pc-installdialog/pc-installdialog.sh

    r9e560f7 r549d441  
    389389    get_dlg_ans "--inputbox \"Enter the real name for $USERNAME\" 8 40" 
    390390    if [ -z "$ANS" ] ; then 
    391        exit_err "Invalid real name entered!" 
     391        ANS="$USERNAME" 
    392392    fi 
    393393    USERREALNAME="$ANS" 
Note: See TracChangeset for help on using the changeset viewer.