Changeset 07e9b0f


Ignore:
Timestamp:
08/21/13 08:17:00 (13 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:
4f9718b, 3e3ac28
Parents:
4a54eef (diff), 84878ce (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:
7 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r4c8cfab9 r84878ce  
    187187src-qt4/libpcbsd/ui/ui_dialogMetaProgress.h 
    188188src-qt4/libpcbsd/ui/ui_dialogwpaenterprise.h 
     189src-qt4/life-preserver/i18n/LifePreserver_af.qm 
     190src-qt4/life-preserver/i18n/LifePreserver_ar.qm 
     191src-qt4/life-preserver/i18n/LifePreserver_az.qm 
     192src-qt4/life-preserver/i18n/LifePreserver_bg.qm 
     193src-qt4/life-preserver/i18n/LifePreserver_bn.qm 
     194src-qt4/life-preserver/i18n/LifePreserver_bs.qm 
     195src-qt4/life-preserver/i18n/LifePreserver_ca.qm 
     196src-qt4/life-preserver/i18n/LifePreserver_cs.qm 
     197src-qt4/life-preserver/i18n/LifePreserver_cy.qm 
     198src-qt4/life-preserver/i18n/LifePreserver_da.qm 
     199src-qt4/life-preserver/i18n/LifePreserver_de.qm 
     200src-qt4/life-preserver/i18n/LifePreserver_el.qm 
     201src-qt4/life-preserver/i18n/LifePreserver_en_GB.qm 
     202src-qt4/life-preserver/i18n/LifePreserver_en_US.qm 
     203src-qt4/life-preserver/i18n/LifePreserver_en_ZA.qm 
     204src-qt4/life-preserver/i18n/LifePreserver_es.qm 
     205src-qt4/life-preserver/i18n/LifePreserver_et.qm 
     206src-qt4/life-preserver/i18n/LifePreserver_eu.qm 
     207src-qt4/life-preserver/i18n/LifePreserver_fa.qm 
     208src-qt4/life-preserver/i18n/LifePreserver_fi.qm 
     209src-qt4/life-preserver/i18n/LifePreserver_fr.qm 
     210src-qt4/life-preserver/i18n/LifePreserver_fr_CA.qm 
     211src-qt4/life-preserver/i18n/LifePreserver_fur.qm 
     212src-qt4/life-preserver/i18n/LifePreserver_gl.qm 
     213src-qt4/life-preserver/i18n/LifePreserver_he.qm 
     214src-qt4/life-preserver/i18n/LifePreserver_hi.qm 
     215src-qt4/life-preserver/i18n/LifePreserver_hr.qm 
     216src-qt4/life-preserver/i18n/LifePreserver_hu.qm 
     217src-qt4/life-preserver/i18n/LifePreserver_id.qm 
     218src-qt4/life-preserver/i18n/LifePreserver_is.qm 
     219src-qt4/life-preserver/i18n/LifePreserver_it.qm 
     220src-qt4/life-preserver/i18n/LifePreserver_ja.qm 
     221src-qt4/life-preserver/i18n/LifePreserver_ka.qm 
     222src-qt4/life-preserver/i18n/LifePreserver_ko.qm 
     223src-qt4/life-preserver/i18n/LifePreserver_lt.qm 
     224src-qt4/life-preserver/i18n/LifePreserver_lv.qm 
     225src-qt4/life-preserver/i18n/LifePreserver_mk.qm 
     226src-qt4/life-preserver/i18n/LifePreserver_mn.qm 
     227src-qt4/life-preserver/i18n/LifePreserver_ms.qm 
     228src-qt4/life-preserver/i18n/LifePreserver_mt.qm 
     229src-qt4/life-preserver/i18n/LifePreserver_nb.qm 
     230src-qt4/life-preserver/i18n/LifePreserver_ne.qm 
     231src-qt4/life-preserver/i18n/LifePreserver_nl.qm 
     232src-qt4/life-preserver/i18n/LifePreserver_pa.qm 
     233src-qt4/life-preserver/i18n/LifePreserver_pl.qm 
     234src-qt4/life-preserver/i18n/LifePreserver_pt.qm 
     235src-qt4/life-preserver/i18n/LifePreserver_pt_BR.qm 
     236src-qt4/life-preserver/i18n/LifePreserver_ro.qm 
     237src-qt4/life-preserver/i18n/LifePreserver_ru.qm 
     238src-qt4/life-preserver/i18n/LifePreserver_sa.qm 
     239src-qt4/life-preserver/i18n/LifePreserver_sk.qm 
     240src-qt4/life-preserver/i18n/LifePreserver_sl.qm 
     241src-qt4/life-preserver/i18n/LifePreserver_sr.qm 
     242src-qt4/life-preserver/i18n/LifePreserver_sv.qm 
     243src-qt4/life-preserver/i18n/LifePreserver_sw.qm 
     244src-qt4/life-preserver/i18n/LifePreserver_ta.qm 
     245src-qt4/life-preserver/i18n/LifePreserver_tg.qm 
     246src-qt4/life-preserver/i18n/LifePreserver_th.qm 
     247src-qt4/life-preserver/i18n/LifePreserver_tr.qm 
     248src-qt4/life-preserver/i18n/LifePreserver_uk.qm 
     249src-qt4/life-preserver/i18n/LifePreserver_uz.qm 
     250src-qt4/life-preserver/i18n/LifePreserver_vi.qm 
     251src-qt4/life-preserver/i18n/LifePreserver_zh_CN.qm 
     252src-qt4/life-preserver/i18n/LifePreserver_zh_HK.qm 
     253src-qt4/life-preserver/i18n/LifePreserver_zh_TW.qm 
     254src-qt4/life-preserver/i18n/LifePreserver_zu.qm 
     255src-qt4/life-preserver/ui_LPConfig.h 
     256src-qt4/life-preserver/ui_LPWizard.h 
     257src-qt4/life-preserver/ui_mainUI.h 
     258src-qt4/pc-firstbootgui/ui_dialogHelp.h 
     259src-qt4/pc-firstbootgui/ui_dialogInfoBox.h 
     260src-qt4/pc-firstbootgui/ui_dialogKeyboard.h 
     261src-qt4/pc-firstbootgui/ui_firstboot.h 
     262src-qt4/pc-firstbootgui/ui_netKey.h 
    189263src-qt4/pc-controlpanel/i18n/pc-controlpanel_af.qm 
    190264src-qt4/pc-controlpanel/i18n/pc-controlpanel_ar.qm 
     
    623697src-qt4/pc-netmanager/src/NetworkManager/pc-netmanager 
    624698src-qt4/pc-mounttray/pc-mounttray 
     699src-qt4/life-preserver/life-preserver 
  • src-qt4/life-preserver/scripts/setup-ssh-keys.sh

    • Property mode changed from 100644 to 100755
  • src-sh/pc-sysinstall/backend/functions-zfsrestore.sh

    r8378d50 r84878ce  
    148148      dChk="`echo $zLine | awk '{print $1}'`" 
    149149 
     150      # Don't need to set empty props 
     151      if [ -z "$val" ] ; then continue ; fi 
     152 
    150153      # We can skip setting mountpoint on BEs 
    151154      echo $dSet | grep -q '^ROOT/' 
  • src-qt4/life-preserver/LPConfig.cpp

    r2a5e337 r4a54eef  
    105105   
    106106  //Replication Settings 
     107  bool updateSSHKey = false; 
    107108  if(isReplicated != ui->groupReplicate->isChecked()){ 
    108109    remoteChanged = true; 
    109110    isReplicated = ui->groupReplicate->isChecked(); 
     111    if(isReplicated){ updateSSHKey = true; } 
    110112  } 
    111113  QString tmp = ui->lineHostName->text().simplified(); 
    112   if( tmp != remoteHost ){ remoteChanged = true; remoteHost = tmp; } 
     114  if( tmp != remoteHost ){ remoteChanged = true; remoteHost = tmp; updateSSHKey=true;} 
    113115  tmp = ui->lineUserName->text().simplified(); 
    114   if( tmp != remoteUser ){ remoteChanged = true; remoteUser = tmp; } 
     116  if( tmp != remoteUser ){ remoteChanged = true; remoteUser = tmp; updateSSHKey=true;} 
    115117  tmp = ui->lineRemoteDataset->text().simplified(); 
    116118  if( tmp != remoteDataset ){ remoteChanged = true; remoteDataset = tmp; } 
    117   if( ui->spinPort->value() != remotePort){ remoteChanged = true; remotePort = ui->spinPort->value(); } 
     119  if( ui->spinPort->value() != remotePort){ remoteChanged = true; remotePort = ui->spinPort->value(); updateSSHKey=true;} 
    118120  int nFreq = -1; 
    119121  if(ui->radioRepTime->isChecked()){ 
     
    124126  }else{ 
    125127    if( nFreq != remoteFreq ){ remoteChanged = true; remoteFreq = nFreq; } 
     128  } 
     129  if(updateSSHKey){ 
     130    //Prompt for the SSH key generation 
     131    LPBackend::setupSSHKey(remoteHost, remoteUser, remotePort); 
    126132  } 
    127133} 
  • src-qt4/life-preserver/LPWizard.cpp

    r2a5e337 r4a54eef  
    3333    remoteUser = ui->lineUserName->text(); 
    3434    remoteDataset = ui->lineRemoteDataset->text(); 
     35    //Prompt for the SSH key generation 
     36    LPBackend::setupSSHKey(remoteHost, remoteUser, remotePort); 
    3537  } 
    3638  if(ui->radioDaily->isChecked()){ localTime = ui->timeEdit->time().hour(); } 
     
    4547    else{ totalSnapshots = ui->spin_keepDays->value() * (1440/(-localTime)); } //convert to number of snapshots a day 
    4648  } 
     49 
    4750  //Now close the UI 
    4851  this->close(); 
  • src-qt4/life-preserver/LPWizard.h

    r2a5e337 r4a54eef  
    55#include <QString> 
    66#include <QDebug> 
     7 
     8#include "LPBackend.h" 
    79 
    810namespace Ui{ 
  • src-qt4/life-preserver/mainUI.cpp

    r96c5e841 r4a54eef  
    239239  } 
    240240  if(CFG.remoteChanged){ 
    241     LPBackend::setupReplication(ds, CFG.remoteHost, CFG.remoteUser, CFG.remotePort, CFG.remoteDataset, CFG.remoteFreq); 
    242     change = true;         
     241    change = true; 
     242    if(CFG.isReplicated){ 
     243      LPBackend::setupReplication(ds, CFG.remoteHost, CFG.remoteUser, CFG.remotePort, CFG.remoteDataset, CFG.remoteFreq); 
     244      QMessageBox::information(this,tr("Reminder"),tr("Don't forget to save your SSH key to a USB stick so that you can restore your system from the remote host later!!")); 
     245    }else{ 
     246      LPBackend::removeReplication(ds); 
     247    } 
    243248  } 
    244249  //Now update the UI if appropriate 
     
    342347      if(wiz.enableReplication){ 
    343348         LPBackend::setupReplication(dataset, wiz.remoteHost, wiz.remoteUser, wiz.remotePort, wiz.remoteDataset, wiz.remoteTime);      
     349         QMessageBox::information(this,tr("Reminder"),tr("Don't forget to save your SSH key to a USB stick so that you can restore your system from the remote host later!!")); 
    344350      } 
    345351    } 
Note: See TracChangeset for help on using the changeset viewer.