Changeset f981222


Ignore:
Timestamp:
08/22/13 10:02:30 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
80faf74
Parents:
3e3ac28 (diff), 5cc3d00 (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 added
20 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r84878ce r93572be  
    685685src-qt4/warden-gui/i18n/Warden_zh_TW.qm 
    686686src-qt4/warden-gui/i18n/Warden_zu.qm 
     687src-qt4/pc-installgui/i18n/SysInstaller_af.qm 
     688src-qt4/pc-installgui/i18n/SysInstaller_ar.qm 
     689src-qt4/pc-installgui/i18n/SysInstaller_az.qm 
     690src-qt4/pc-installgui/i18n/SysInstaller_bg.qm 
     691src-qt4/pc-installgui/i18n/SysInstaller_bn.qm 
     692src-qt4/pc-installgui/i18n/SysInstaller_bs.qm 
     693src-qt4/pc-installgui/i18n/SysInstaller_ca.qm 
     694src-qt4/pc-installgui/i18n/SysInstaller_cs.qm 
     695src-qt4/pc-installgui/i18n/SysInstaller_cy.qm 
     696src-qt4/pc-installgui/i18n/SysInstaller_da.qm 
     697src-qt4/pc-installgui/i18n/SysInstaller_de.qm 
     698src-qt4/pc-installgui/i18n/SysInstaller_el.qm 
     699src-qt4/pc-installgui/i18n/SysInstaller_en.qm 
     700src-qt4/pc-installgui/i18n/SysInstaller_en_GB.qm 
     701src-qt4/pc-installgui/i18n/SysInstaller_en_US.qm 
     702src-qt4/pc-installgui/i18n/SysInstaller_en_ZA.qm 
     703src-qt4/pc-installgui/i18n/SysInstaller_es.qm 
     704src-qt4/pc-installgui/i18n/SysInstaller_et.qm 
     705src-qt4/pc-installgui/i18n/SysInstaller_eu.qm 
     706src-qt4/pc-installgui/i18n/SysInstaller_fa.qm 
     707src-qt4/pc-installgui/i18n/SysInstaller_fi.qm 
     708src-qt4/pc-installgui/i18n/SysInstaller_fr.qm 
     709src-qt4/pc-installgui/i18n/SysInstaller_fr_CA.qm 
     710src-qt4/pc-installgui/i18n/SysInstaller_fur.qm 
     711src-qt4/pc-installgui/i18n/SysInstaller_gl.qm 
     712src-qt4/pc-installgui/i18n/SysInstaller_he.qm 
     713src-qt4/pc-installgui/i18n/SysInstaller_hi.qm 
     714src-qt4/pc-installgui/i18n/SysInstaller_hr.qm 
     715src-qt4/pc-installgui/i18n/SysInstaller_hu.qm 
     716src-qt4/pc-installgui/i18n/SysInstaller_id.qm 
     717src-qt4/pc-installgui/i18n/SysInstaller_is.qm 
     718src-qt4/pc-installgui/i18n/SysInstaller_it.qm 
     719src-qt4/pc-installgui/i18n/SysInstaller_ja.qm 
     720src-qt4/pc-installgui/i18n/SysInstaller_ka.qm 
     721src-qt4/pc-installgui/i18n/SysInstaller_ko.qm 
     722src-qt4/pc-installgui/i18n/SysInstaller_lt.qm 
     723src-qt4/pc-installgui/i18n/SysInstaller_lv.qm 
     724src-qt4/pc-installgui/i18n/SysInstaller_mk.qm 
     725src-qt4/pc-installgui/i18n/SysInstaller_mn.qm 
     726src-qt4/pc-installgui/i18n/SysInstaller_ms.qm 
     727src-qt4/pc-installgui/i18n/SysInstaller_mt.qm 
     728src-qt4/pc-installgui/i18n/SysInstaller_nb.qm 
     729src-qt4/pc-installgui/i18n/SysInstaller_ne.qm 
     730src-qt4/pc-installgui/i18n/SysInstaller_nl.qm 
     731src-qt4/pc-installgui/i18n/SysInstaller_pa.qm 
     732src-qt4/pc-installgui/i18n/SysInstaller_pl.qm 
     733src-qt4/pc-installgui/i18n/SysInstaller_pt.qm 
     734src-qt4/pc-installgui/i18n/SysInstaller_pt_BR.qm 
     735src-qt4/pc-installgui/i18n/SysInstaller_ro.qm 
     736src-qt4/pc-installgui/i18n/SysInstaller_ru.qm 
     737src-qt4/pc-installgui/i18n/SysInstaller_sa.qm 
     738src-qt4/pc-installgui/i18n/SysInstaller_sk.qm 
     739src-qt4/pc-installgui/i18n/SysInstaller_sl.qm 
     740src-qt4/pc-installgui/i18n/SysInstaller_sr.qm 
     741src-qt4/pc-installgui/i18n/SysInstaller_sv.qm 
     742src-qt4/pc-installgui/i18n/SysInstaller_sw.qm 
     743src-qt4/pc-installgui/i18n/SysInstaller_ta.qm 
     744src-qt4/pc-installgui/i18n/SysInstaller_tg.qm 
     745src-qt4/pc-installgui/i18n/SysInstaller_th.qm 
     746src-qt4/pc-installgui/i18n/SysInstaller_tr.qm 
     747src-qt4/pc-installgui/i18n/SysInstaller_uk.qm 
     748src-qt4/pc-installgui/i18n/SysInstaller_uz.qm 
     749src-qt4/pc-installgui/i18n/SysInstaller_vi.qm 
     750src-qt4/pc-installgui/i18n/SysInstaller_zh_CN.qm 
     751src-qt4/pc-installgui/i18n/SysInstaller_zh_HK.qm 
     752src-qt4/pc-installgui/i18n/SysInstaller_zh_TW.qm 
     753src-qt4/pc-installgui/i18n/SysInstaller_zu.qm 
     754src-qt4/pc-installgui/ui_wizardRestore.h 
    687755 
    688756# Compiled binaries 
  • build-files/conf/installcd-prunelist

    rdb69d7bb r5313c46  
    367367usr/local/share/pcbsd/de-profiles 
    368368usr/local/share/pcbsd/icons 
    369 usr/local/share/pcbsd/pc-netmanager 
    370369usr/local/share/pcbsd/pc-updatemanager 
    371370usr/local/share/pcbsd/xorg-gui 
     
    410409usr/local/bin/EasyPBI 
    411410usr/local/bin/life-preserver 
     411usr/local/bin/pc-ad* 
     412usr/local/bin/pc-bootc* 
    412413usr/local/bin/pc-blue* 
     414usr/local/bin/pc-bug* 
    413415usr/local/bin/pc-control* 
    414416usr/local/bin/pc-cups* 
    415 usr/local/bin/pc-ethernet* 
    416417usr/local/bin/pc-fbsd* 
    417418usr/local/bin/pc-first* 
    418419usr/local/bin/pc-gdm* 
     420usr/local/bin/pc-krb* 
     421usr/local/bin/pc-ldap* 
    419422usr/local/bin/pc-mount* 
    420 usr/local/bin/pc-net* 
    421423usr/local/bin/pc-pbi* 
    422424usr/local/bin/pc-pf* 
    423425usr/local/bin/pc-runx* 
     426usr/local/bin/pc-samba* 
    424427usr/local/bin/pc-service* 
    425428usr/local/bin/pc-soft* 
  • src-qt4/pc-installgui/installer.cpp

    r1d1b425 r93572be  
    2626    connect(pushChangeKeyLayout, SIGNAL(clicked()), this, SLOT(slotPushKeyLayout())); 
    2727    connect(pushHardware, SIGNAL(clicked()), this, SLOT(slotCheckHardware())); 
     28    connect(pushNetwork, SIGNAL(clicked()), this, SLOT(slotStartNetworkManager())); 
    2829    connect(pushLoadConfig, SIGNAL(clicked()), this, SLOT(slotLoadConfigUSB())); 
    2930    connect(pushSaveConfig, SIGNAL(clicked()), this, SLOT(slotSaveConfigUSB())); 
     
    348349       } 
    349350    } 
     351 
     352 
    350353 
    351354    // If after doing the mirror, our list is empty, break out 
     
    398401              } 
    399402            }  
    400             summaryList << tr("ZFS Datasets:<br>") + " " + zDS.join("<br>"); 
     403            if ( radioRestore->isChecked()) 
     404               summaryList << tr("ZFS Datasets:") + " " + tr("The original ZFS layout will be restored"); 
     405            else 
     406               summaryList << tr("ZFS Datasets:<br>") + " " + zDS.join("<br>"); 
    401407          } else { 
    402408            summaryList << tr("Mount:") + " " + copyList.at(i).at(2); 
     
    453459        summaryList << ""; 
    454460        summaryList << tr("Partition:") + " " + workingDisk + "(" + workingSlice + "):"; 
     461 
    455462        summaryList << tr("FileSystem:") + " " + copyList.at(i).at(3); 
     463 
    456464        summaryList << tr("Size:") + " " + copyList.at(i).at(4) + "MB "; 
    457465        if ( copyList.at(i).at(3) != "ZFS" ) 
     
    480488  wDisk->programInit(); 
    481489  wDisk->setWindowModality(Qt::ApplicationModal); 
     490  if ( radioRestore->isChecked() ) 
     491    wDisk->setRestoreMode(); 
    482492  connect(wDisk, SIGNAL(saved(QList<QStringList>, bool, bool, QString, bool)), this, SLOT(slotSaveDiskChanges(QList<QStringList>, bool, bool, QString, bool))); 
    483493  wDisk->show(); 
     
    536546 
    537547  selectedPkgs.clear(); 
     548  if ( radioRestore->isChecked() ) 
     549  { 
     550     pushDeskCustomize->setEnabled(false); 
     551     textDeskSummary->setText(tr("Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.")); 
     552     return; 
     553  } 
     554 
     555  pushDeskCustomize->setEnabled(true); 
    538556 
    539557  // Set the default desktop meta-pkgs based upon the selection 
     
    593611    connect(radioDesktop,SIGNAL(clicked()), this, SLOT(slotChangedMetaPkgSelection())); 
    594612    connect(radioServer,SIGNAL(clicked()), this, SLOT(slotChangedMetaPkgSelection())); 
     613    connect(radioRestore,SIGNAL(clicked()), this, SLOT(slotChangedMetaPkgSelection())); 
    595614    slotChangedMetaPkgSelection(); 
    596615} 
     
    652671   } 
    653672 
     673   // Start the Restore wizard 
     674   if ( radioRestore->isChecked() && installStackWidget->currentIndex() == 1 ) {  
     675     wRestore = new wizardRestore(); 
     676     wRestore->setWindowModality(Qt::ApplicationModal); 
     677     wRestore->programInit(); 
     678     connect(wRestore, SIGNAL(saved(QStringList)), this, SLOT(slotSaveRestoreSettings(QStringList))); 
     679     wRestore->show(); 
     680     wRestore->raise(); 
     681     return ; 
     682   } 
     683 
    654684   // Start the TrueOS wizard 
    655685   if ( radioServer->isChecked() && installStackWidget->currentIndex() == 1 ) {  
     
    677707   { 
    678708      startConfigGen(); 
     709      QString msg; 
     710 
     711      if (radioRestore->isChecked() ) 
     712        msg=tr("Start the restore now?"); 
     713      else 
     714        msg=tr("Start the installation now?"); 
     715 
    679716      int ret = QMessageBox::question(this, tr("PC-BSD Installer"), 
    680                                 tr("Start the installation now?"), 
     717                                msg, 
    681718                                QMessageBox::No | QMessageBox::Yes, 
    682719                                QMessageBox::No); 
     
    763800  tmpList << "# Auto-Generated pc-sysinstall configuration"; 
    764801  tmpList << "installInteractive=no"; 
     802 
     803  // Are we doing a restore? 
     804  if ( radioRestore->isChecked() ) 
     805  { 
     806    tmpList << "installMode=zfsrestore"; 
     807    tmpList << ""; 
     808    tmpList << "sshHost=" + restOpts.at(0); 
     809    tmpList << "sshUser=" + restOpts.at(1); 
     810    tmpList << "sshPort=" + restOpts.at(2); 
     811    if ( ! restOpts.at(3).isEmpty() ) 
     812      tmpList << "sshKey=" + restOpts.at(3); 
     813    tmpList << "zfsProps=" + restOpts.at(4); 
     814    tmp = restOpts.at(4); 
     815    tmp.replace(".lp-props-", ""); 
     816    tmp.replace("#", "/"); 
     817    tmpList << "zfsRemoteDataset=" + tmp; 
     818 
     819    // Using a custom zpool name? 
     820    if ( ! zpoolName.isEmpty() ) 
     821      tmpList << "zpoolName=" + zpoolName; 
     822 
     823    // Are we force enabling ZFS 4K block sizes? 
     824    if ( force4K ) 
     825      tmpList << "zfsForce4k=YES"; 
     826 
     827    tmpList << ""; 
     828    return tmpList; 
     829  } // End of restore options 
     830 
    765831 
    766832  if ( sysFinalDiskLayout.at(0).at(0) == "MANUAL" ) 
     
    894960 
    895961  cfgList+=getDiskCfgSettings(); 
    896  
    897   cfgList+=getComponentCfgSettings(); 
    898  
    899   // Save the install config script to disk 
    900   cfgList << "runExtCommand=/root/save-config.sh"; 
    901  
    902   cfgList+= ""; 
    903  
    904   // If doing install from package disk 
    905   if ( hasPkgsOnMedia ) 
    906     cfgList+=getDeskPkgCfg(); 
    907  
    908   cfgList+= ""; 
    909  
    910   if ( radioDesktop->isChecked() ) { 
    911     // Doing PC-BSD Install 
    912  
    913     QString lang; 
    914     if ( comboLanguage->currentIndex() != 0 ) 
    915       lang = languages.at(comboLanguage->currentIndex()).section("(",1,1).section(")",0,0); 
    916     else 
    917       lang="en_US"; 
    918  
    919     // Setup the desktop 
    920     cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh desktop " + lang; 
    921  
    922     // Setup for a fresh system first boot 
    923     cfgList << "# Touch flags to enable PC-BSD setup at first boot"; 
    924     cfgList << "runCommand=touch /var/.runxsetup"; 
    925     cfgList << "runCommand=touch /var/.pcbsd-firstboot"; 
    926     cfgList << "runCommand=touch /var/.pcbsd-firstgui"; 
    927  
    928   } else { 
    929     // Doing TrueOS Install 
    930     cfgList+=getUsersCfgSettings(); 
    931  
    932     // Enable SSH? 
    933     if ( fSSH ) 
    934       cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf"; 
    935  
    936     // Setup the TrueOS server 
    937     cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server"; 
    938  
    939   }  
    940  
    941   // Run newaliases to fix mail errors 
    942   cfgList << "runCommand=newaliases"; 
     962  
     963  // We can skip these options if doing a restore 
     964  if ( ! radioRestore->isChecked() ) { 
     965 
     966    cfgList+=getComponentCfgSettings(); 
     967 
     968    // Save the install config script to disk 
     969    cfgList << "runExtCommand=/root/save-config.sh"; 
     970 
     971    cfgList+= ""; 
     972 
     973    // If doing install from package disk 
     974    if ( hasPkgsOnMedia ) 
     975      cfgList+=getDeskPkgCfg(); 
     976 
     977    cfgList+= ""; 
     978 
     979    if ( radioDesktop->isChecked() ) { 
     980      // Doing PC-BSD Install 
     981 
     982      QString lang; 
     983      if ( comboLanguage->currentIndex() != 0 ) 
     984        lang = languages.at(comboLanguage->currentIndex()).section("(",1,1).section(")",0,0); 
     985      else 
     986        lang="en_US"; 
     987 
     988      // Setup the desktop 
     989      cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh desktop " + lang; 
     990 
     991      // Setup for a fresh system first boot 
     992      cfgList << "# Touch flags to enable PC-BSD setup at first boot"; 
     993      cfgList << "runCommand=touch /var/.runxsetup"; 
     994      cfgList << "runCommand=touch /var/.pcbsd-firstboot"; 
     995      cfgList << "runCommand=touch /var/.pcbsd-firstgui"; 
     996 
     997    } else { 
     998      // Doing TrueOS Install 
     999      cfgList+=getUsersCfgSettings(); 
     1000 
     1001      // Enable SSH? 
     1002      if ( fSSH ) 
     1003        cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf"; 
     1004 
     1005      // Setup the TrueOS server 
     1006      cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server"; 
     1007 
     1008    }  
     1009 
     1010    // Run newaliases to fix mail errors 
     1011    cfgList << "runCommand=newaliases"; 
     1012 
     1013  } // End of restore check 
    9431014 
    9441015  // Now write out the cfgList to file 
     
    11501221void Installer::startInstall() 
    11511222{ 
     1223 
     1224  // Update the UI elements if doing a restore 
     1225  if ( radioRestore->isChecked() ) 
     1226  { 
     1227      labelFinished->setText(tr("Your system is now restored!\nClick Finish to reboot. After rebooting you may eject the install media.")); 
     1228      groupInstall->setTitle(tr("System Restore")); 
     1229      labelInstallHeader->setText(tr("Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.")); 
     1230  } 
     1231 
    11521232  QString cfgFile; 
    11531233  if (customCfgFile.isEmpty() ) 
     
    11631243  installFoundMetaCounter = false; 
    11641244  installFoundFetchOutput = false; 
     1245  inZFSSend = false; 
    11651246 
    11661247  // Setup some defaults for the secondary progress bar 
     
    12801361     //qDebug() << tmp; 
    12811362 
    1282      // If doing a restore, don't bother checking for other values 
    1283      //if ( radioRestore->isChecked() ) { 
    1284      //   labelInstallStatus->setText(tmp); 
    1285      // continue; 
    1286      //}  
     1363     // If doing a restore we can do all parsing right here 
     1364     if ( radioRestore->isChecked() ) { 
     1365       line = tmp; 
     1366 
     1367       if ( tmp.contains("total estimated size")) 
     1368       {   
     1369          repTotalK = line.section(" ",-1).simplified(); 
     1370          double totSize = displayToDoubleK(repTotalK); 
     1371          progressBarInstall->setRange(0, totSize + 1024); 
     1372          inZFSSend = true; 
     1373          continue; 
     1374       }  
     1375       if ( tmp.contains("Moving datasets to")) 
     1376          inZFSSend=false; 
     1377 
     1378       if( line.contains("send from ") ) 
     1379         continue; 
     1380       if( line.contains("TIME ") ) 
     1381         continue; 
     1382 
     1383       labelInstallStatus->setText(tmp); 
     1384 
     1385       if ( ! inZFSSend ) 
     1386          continue; 
     1387 
     1388       // We got here, lets parse the ZFS send message 
     1389       parseStatusMessage(tmp); 
     1390 
     1391       continue; 
     1392     } // End of restore parsing 
    12871393 
    12881394     // Parse fetch output 
     
    17061812  startInstall(); 
    17071813} 
     1814 
     1815void Installer::slotStartNetworkManager()  
     1816{ 
     1817  system("/usr/local/bin/pc-netmanager -installer &"); 
     1818} 
     1819 
     1820void Installer::slotSaveRestoreSettings(QStringList Opts) 
     1821{ 
     1822  restOpts = Opts; 
     1823 
     1824  textEditDiskSummary->clear(); 
     1825  QStringList summary = getDiskSummary(); 
     1826  for ( int i=0; i < summary.count(); ++i) 
     1827    textEditDiskSummary->append(summary.at(i)); 
     1828                
     1829  textEditDiskSummary->moveCursor(QTextCursor::Start); 
     1830  
     1831  startConfigGen(); 
     1832  installStackWidget->setCurrentIndex(installStackWidget->currentIndex() + 1); 
     1833} 
     1834 
     1835void Installer::parseStatusMessage(QString stat){ 
     1836  //qDebug() << "msg:" << stat; 
     1837  QString dispTotal; 
     1838 
     1839  //Divide up the status message into sections 
     1840  stat.replace("\t"," "); 
     1841  QString cSize = stat.section(" ",1,1,QString::SectionSkipEmpty); 
     1842 
     1843  //Now Setup the tooltip 
     1844  if(!repTotalK.isEmpty()){ 
     1845    double c = displayToDoubleK(cSize); 
     1846    progressBarInstall->setValue(c); 
     1847    dispTotal = repTotalK; 
     1848  } else { 
     1849    dispTotal = "??"; 
     1850  } 
     1851 
     1852  //Format the tooltip String 
     1853  QString status = cSize+"/"+dispTotal; 
     1854 
     1855  QString txt = QString(tr("Restoring system: %1")).arg(status); 
     1856  labelInstallStatus->setText(txt); 
     1857 
     1858} 
     1859 
     1860double Installer::displayToDoubleK(QString displayNumber){ 
     1861  QStringList labels; 
     1862    labels << "K" << "M" << "G" << "T" << "P" << "E"; 
     1863  QString clab = displayNumber.right(1); //last character is the size label 
     1864        displayNumber.chop(1); //remove the label from the number 
     1865  double num = displayNumber.toDouble(); 
     1866  //Now format the number properly 
     1867  bool ok = false; 
     1868  for(int i=0; i<labels.length(); i++){ 
     1869    if(labels[i] == clab){ ok = true; break; } 
     1870    else{ num = num*1024; } //get ready for the next size 
     1871  } 
     1872  if(!ok){ num = -1; } //could not determine the size 
     1873  return num; 
     1874} 
     1875 
  • src-qt4/pc-installgui/installer.h

    rfe5d5c8 r93572be  
    1717#include "wizardFreeBSD.h" 
    1818#include "wizardDisk.h" 
     19#include "wizardRestore.h" 
    1920 
    2021#define wFREEBSD 1 
     
    6465    void slotLoadConfigUSB(); 
    6566 
     67    // Slot to start the network manager 
     68    void slotStartNetworkManager(); 
     69 
    6670    // Desktop selector slots 
    6771    void slotDesktopCustomizeClicked(); 
     
    7074    void slotSaveFBSDSettings(QString, QString, QString, QString, QString, QString, bool, bool, bool, QStringList); 
    7175 
     76    // Restore-related slots 
     77    void slotSaveRestoreSettings(QStringList); 
     78 
    7279 
    7380private: 
     
    7683    void startInstall(); // Function which begins the install process 
    7784    void installFailed(); // Function which does post-install failure stuff 
     85 
     86    // Functions to parse ZFS send/recv messages 
     87    bool inZFSSend; 
     88    double displayToDoubleK(QString); 
     89    void parseStatusMessage(QString); 
     90    QString repTotalK; 
    7891 
    7992    // Disk functions 
     
    144157    // FreeBSD setup wizard 
    145158    wizardFreeBSD *wFBSD; 
     159 
     160    // Restore wizard 
     161    wizardRestore *wRestore; 
    146162     
    147163    // FreeBSD options 
     
    176192    bool force4K; 
    177193 
     194    // Restore Options 
     195    QStringList restOpts; 
     196 
    178197protected: 
    179198    void closeEvent(QCloseEvent *event); 
  • src-qt4/pc-installgui/installer.ui

    rcd7f833 r93572be  
    100100       </item> 
    101101       <item> 
     102        <widget class="QPushButton" name="pushNetwork"> 
     103         <property name="statusTip"> 
     104          <string>Manage network connectivity</string> 
     105         </property> 
     106         <property name="text"> 
     107          <string/> 
     108         </property> 
     109         <property name="icon"> 
     110          <iconset resource="sysinstaller.qrc"> 
     111           <normaloff>:/modules/images/networkwired.png</normaloff>:/modules/images/networkwired.png</iconset> 
     112         </property> 
     113         <property name="iconSize"> 
     114          <size> 
     115           <width>32</width> 
     116           <height>32</height> 
     117          </size> 
     118         </property> 
     119         <property name="flat"> 
     120          <bool>true</bool> 
     121         </property> 
     122        </widget> 
     123       </item> 
     124       <item> 
    102125        <widget class="QPushButton" name="helpButton"> 
    103126         <property name="statusTip"> 
     
    262285      </property> 
    263286      <property name="currentIndex"> 
    264        <number>1</number> 
     287       <number>4</number> 
    265288      </property> 
    266289      <widget class="QWidget" name="page"> 
     
    602625             </property> 
    603626            </spacer> 
     627           </item> 
     628           <item row="2" column="1"> 
     629            <widget class="QRadioButton" name="radioRestore"> 
     630             <property name="text"> 
     631              <string>Restore from Life-Preserver backup</string> 
     632             </property> 
     633             <property name="icon"> 
     634              <iconset resource="sysinstaller.qrc"> 
     635               <normaloff>:/modules/images/lifepreserver.png</normaloff>:/modules/images/lifepreserver.png</iconset> 
     636             </property> 
     637             <property name="iconSize"> 
     638              <size> 
     639               <width>32</width> 
     640               <height>32</height> 
     641              </size> 
     642             </property> 
     643            </widget> 
    604644           </item> 
    605645          </layout> 
     
    10621102        </item> 
    10631103        <item row="1" column="1"> 
    1064          <widget class="QGroupBox" name="groupBox_5"> 
     1104         <widget class="QGroupBox" name="groupInstall"> 
    10651105          <property name="font"> 
    10661106           <font> 
     
    12121252        </item> 
    12131253        <item row="1" column="1"> 
    1214          <widget class="QLabel" name="label_3"> 
     1254         <widget class="QLabel" name="labelFinished"> 
    12151255          <property name="styleSheet"> 
    12161256           <string notr="true">background: transparent;</string> 
  • src-qt4/pc-installgui/pc-installgui.pro

    r24ef714 r93572be  
    1414    wizardDisk.cpp \ 
    1515    wizardFreeBSD.cpp \ 
     16    wizardRestore.cpp \ 
    1617    installer.cpp \ 
    1718    backend.cpp 
     
    2526    wizardDisk.h \ 
    2627    wizardFreeBSD.h \ 
     28    wizardRestore.h \ 
    2729    helpText.h \ 
    2830    backend.h 
     
    98100dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
    99101 
    100 INSTALLS += target dotrans 
     102scripts.path=/usr/local/share/pcbsd/pc-installgui 
     103scripts.extra=cp scripts/* /usr/local/share/pcbsd/pc-installgui/ && chmod 755 /usr/local/share/pcbsd/pc-installgui/*.sh 
    101104 
    102 FORMS += installer.ui dialogCheckHardware.ui dialogDesktopSelection.ui dialogFSSize.ui dialogHelp.ui wizardFreeBSD.ui dialogKeyboard.ui wizardDisk.ui dialogInfoBox.ui 
     105INSTALLS += target dotrans scripts 
     106 
     107FORMS += installer.ui dialogCheckHardware.ui dialogDesktopSelection.ui dialogFSSize.ui dialogHelp.ui wizardFreeBSD.ui dialogKeyboard.ui wizardDisk.ui dialogInfoBox.ui wizardRestore.ui 
     108 
    103109RESOURCES += sysinstaller.qrc 
  • src-qt4/pc-installgui/sysinstaller.qrc

    r0de7e02 r93572be  
    11<RCC> 
    22  <qresource prefix="/modules"> 
     3    <file>images/lifepreserver.png</file> 
    34    <file>images/configure.png</file> 
    45    <file>images/usb.png</file> 
  • src-qt4/pc-installgui/wizardDisk.cpp

    r454e8cd3 r93572be  
    1919{ 
    2020  prevID = 0; 
     21  restoreMode=false; 
    2122 
    2223  populateDiskInfo(); 
     
    444445  slotTreeDiskChanged();   
    445446 
     447  if ( restoreMode ) { 
     448     treeMounts->setEnabled(false); 
     449     pushRemoveMount->setEnabled(false); 
     450     pushAddMount->setEnabled(false); 
     451     labelMounts->setText(tr("The original system datasets / mount-points will be automatically restored.")); 
     452  } 
     453 
    446454} 
    447455 
     
    10611069} 
    10621070 
     1071void wizardDisk::setRestoreMode() 
     1072{ 
     1073  restoreMode=true; 
     1074} 
  • src-qt4/pc-installgui/wizardDisk.h

    r0ece806 r93572be  
    2020 
    2121    void programInit(); 
     22    void setRestoreMode(); 
    2223    virtual int nextId() const; 
    2324 
     
    8788    QMenu *popupNE; 
    8889    dialogFSSize *rFS; 
     90    bool restoreMode; 
    8991    enum { Page_Intro, Page_BasicDisk, Page_ZFS, Page_Mounts, Page_Expert, Page_Confirmation }; 
    9092 
  • src-qt4/pc-installgui/wizardDisk.ui

    r3d554ff r93572be  
    673673    </item> 
    674674    <item row="1" column="1"> 
    675      <widget class="QLabel" name="label_18"> 
     675     <widget class="QLabel" name="labelMounts"> 
    676676      <property name="sizePolicy"> 
    677677       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> 
  • src-qt4/pc-netmanager/src/NetworkManager/main.cpp

    r1620346 rc9d1400  
    1 #include <qtranslator.h> 
     1#include <QApplication> 
    22#include <qlocale.h> 
     3#include <qtsingleapplication.h> 
    34#include <QDebug> 
    45#include <QFile> 
    5 #include <QApplication> 
     6#include <QObject> 
     7#include <QString> 
     8#include <QTranslator> 
    69#include "networkman.h" 
    710#include "../../../config.h" 
     
    912int main( int argc, char ** argv ) 
    1013{ 
    11     QApplication a(argc, argv); 
     14    QtSingleApplication a(argc, argv); 
     15    if (a.isRunning()) 
     16      return !(a.sendMessage("show")); 
    1217 
    1318    QTranslator translator; 
     
    2429    w.Init(); 
    2530 
     31    // Are we running via the system-installer? 
     32    if ( argc == 2 ) { 
     33       QString tmp = argv[1]; 
     34       if ( tmp == "-installer" ) 
     35         w.setInstallerMode(); 
     36    } 
     37 
    2638    w.show(); 
     39 
     40    a.connect( &a, SIGNAL( messageReceived(const QString &) ), &w, SLOT( slotSingleInstance() ) ); 
    2741    a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); 
    2842    return a.exec(); 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    r0f79dd90 re4632f9  
    3434void NetworkMan::Init() 
    3535{ 
     36    InstallerMode = false; 
    3637    Changed = FALSE; 
    3738     
     
    411412     textStatus2->setText(SSID); 
    412413   } else { 
    413      checkSysTray->setVisible(TRUE); 
     414     if ( ! InstallerMode ) 
     415       checkSysTray->setVisible(TRUE); 
    414416     textStatusLabel2->setText(tr("MAC Address:")); 
    415417     textStatus2->setText(DevsMAC[sel]); 
     
    10881090    } 
    10891091} 
     1092 
     1093void NetworkMan::slotSingleInstance() 
     1094{ 
     1095  this->show(); 
     1096  this->raise(); 
     1097} 
     1098 
     1099 
     1100void NetworkMan::setInstallerMode() 
     1101{ 
     1102  checkSysTray->setHidden(true); 
     1103  groupBoxMisc->setHidden(true); 
     1104  InstallerMode = true; 
     1105} 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.h

    r1620346 rc9d1400  
    2525public slots: 
    2626    void Init(); 
     27    void setInstallerMode(); 
    2728 
    2829private slots: 
     
    4849    void slotIPV6DNS1Clicked(); 
    4950    void slotIPV6DNS2Clicked(); 
     51    void slotSingleInstance(); 
    5052 
    5153 
    5254private: 
     55    bool InstallerMode; 
    5356    QString Devs[100]; 
    5457    QString DevsParent[100]; 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.ui

    r2e77b02 rc9d1400  
    220220      <layout class="QGridLayout" name="gridLayout_8"> 
    221221       <item row="4" column="0"> 
    222         <widget class="QGroupBox" name="groupBox"> 
     222        <widget class="QGroupBox" name="groupBoxMisc"> 
    223223         <property name="title"> 
    224224          <string>Misc</string> 
  • src-qt4/port-files/pkg-plist

    r06f4c30 r93572be  
    4343sbin/PCDMd 
    4444sbin/PCDM-xloop 
     45share/pcbsd/pc-installgui/load-usb-key.sh 
     46share/pcbsd/pc-installgui/get-zfs-restore-list.sh 
     47share/pcbsd/pc-installgui/setup-ssh-keys.sh 
    4548share/pcbsd/xstartup/enable-ibus.sh 
    4649share/pcbsd/xstartup/checkupdater.sh 
     
    26102613@dirrm share/pcbsd/pc-controlpanel/icons 
    26112614@dirrm share/pcbsd/pc-controlpanel 
     2615@dirrm share/pcbsd/pc-installgui 
    26122616@dirrm share/pcbsd/pc-netmanager/pics 
    26132617@dirrm share/pcbsd/pc-netmanager 
  • src-qt4/warden-gui/dialogwarden.cpp

    r27f03ba rbd52c24  
    11341134     if ( jailDetails.at(i).at(2) == "Linux Jail" ) { 
    11351135        pushServiceGUI->setHidden(true); 
     1136        pushPackageManager->setHidden(true); 
    11361137        pushUserAdmin->setHidden(true); 
    11371138        pushUpdate->setHidden(true); 
     
    11391140     } else { 
    11401141        pushServiceGUI->setHidden(false); 
     1142        pushPackageManager->setHidden(false); 
    11411143        pushUserAdmin->setHidden(false); 
    11421144        pushUpdate->setHidden(false); 
  • src-sh/lpreserver/lpreserver

    ra493689 r5cc3d00  
    4545 
    4646cat<<__EOF__ 
     47        get - Get list of lpreserver options 
    4748     mksnap - Create a ZFS snapshot of a zpool/dataset 
    4849   listsnap - List snapshots of a zpool/dataset 
     
    5152 revertsnap - Revert zpool/dataset to a snapshot 
    5253  replicate - Enable / Disable ZFS replication to a remote system 
     54        set - Set lpreserver options 
    5355     status - List datasets, along with last snapshot / replication date  
    5456     rmsnap - Remove a snapshot 
  • src-sh/pc-sysinstall/backend/functions-zfsrestore.sh

    r84878ce rbec1293  
    102102  zSEND="ssh -p $SSHPORT ${SSHKEY} ${SSHUSER}@${SSHHOST} zfs send -Rv ${ZFSDATASET}@${lastSNAP}" 
    103103  zRECV="zfs receive -evuF ${ZPOOLNAME}" 
    104   $zSEND | $zRECV 
     104  $zSEND | $zRECV >/dev/null 2>/dev/null 
    105105  if [ $? -ne 0 ] ; then 
    106106     exit_err "Failed ZFS send / receive" 
  • src-sh/warden/scripts/backend/functions.sh

    r6cf118f r29f8f9d  
    185185# Mount all the FS needed for a PBI container 
    186186mountpbibox() { 
     187 
     188  # Update the user files on the portjail 
     189  ETCFILES="resolv.conf passwd master.passwd spwd.db pwd.db group localtime" 
     190  for file in ${ETCFILES}; do 
     191    rm ${JDIR}/${1}/etc/${file} >/dev/null 2>&1 
     192    cp /etc/${file} ${JDIR}/${1}/etc/${file} 
     193  done 
    187194 
    188195  for nullfs_mount in ${NULLFS_MOUNTS}; do 
  • src-qt4/pc-softwaremanager/mainUI.ui

    re46485b r3e3ac28  
    409409                <item> 
    410410                 <widget class="QToolButton" name="tool_install_gotobrowserpage"> 
     411                  <property name="sizePolicy"> 
     412                   <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> 
     413                    <horstretch>0</horstretch> 
     414                    <verstretch>0</verstretch> 
     415                   </sizepolicy> 
     416                  </property> 
    411417                  <property name="statusTip"> 
    412418                   <string>Open the browser page for the selected application</string> 
    413419                  </property> 
    414420                  <property name="text"> 
    415                    <string>Open Browser</string> 
     421                   <string>Product Page</string> 
    416422                  </property> 
    417423                  <property name="icon"> 
Note: See TracChangeset for help on using the changeset viewer.