Changeset f74e9cd


Ignore:
Timestamp:
Aug 27, 2013 9:48:33 AM (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
4069c7b, aac7789e
Parents:
c3b1e67 (diff), 5e274ef (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

Location:
src-qt4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-firstbootgui/firstboot.cpp

    rd277133 r5e274ef  
    456456  // Encrypt the users home-directory? 
    457457  if ( checkEnc->isChecked() ) 
    458     system("enable_user_pefs " + lineUsername->text().toLatin1() + " " + linePW->text().toLatin1()); 
     458    QProcess::execute("enable_user_pefs", QStringList() << lineUsername->text() << linePW->text()); 
    459459 
    460460  // Do we need to change the system hostname? 
  • src-qt4/pc-bootconfig/mainUI.cpp

    r13dd2f6 rc3b1e67  
    341341 int index = getSelectedBE(); 
    342342  if(index != -1){ 
     343    if(ui->tree_BE->topLevelItem(index)->text(1).toLower() == "yes"){ 
     344      QMessageBox::warning(this,tr("Running Boot Environment"),tr("You cannot make a copy of the currently running boot environment!") ); 
     345      return; 
     346    } 
    343347    bool updateGRUB=false; 
    344348    if( ui->tree_BE->topLevelItemCount() == 1){updateGRUB=true;} //moving from 1 to 2 
Note: See TracChangeset for help on using the changeset viewer.