Changeset da7c222


Ignore:
Timestamp:
05/07/13 11:31:01 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
a37ff35
Parents:
893388a5
Message:

Remove the FreeBSD option from install, since its not on the disk media anymore

Location:
src-qt4/pc-installgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    rd539e77 rda7c222  
    574574  if ( direction && wheelCurItem >= wheelIcons.size() ) 
    575575    return; 
    576   if ( ! direction && wheelCurItem <= 1 ) 
     576  if ( ! direction && wheelCurItem <= 2 ) 
    577577    return; 
    578578 
     
    675675{ 
    676676    // Init the desktop selector 
    677     wheelIcons << ":modules/images/freebsd.png" << ":/modules/images/pcbsd-server.png" << ":/PCBSD/images/kde.png" << ":/PCBSD/images/lxde.png" << ":/PCBSD/images/gnome.png" << ":/PCBSD/images/xfce.png"; 
     677    wheelIcons << "" << ":/modules/images/pcbsd-server.png" << ":/PCBSD/images/kde.png" << ":/PCBSD/images/lxde.png" << ":/PCBSD/images/gnome.png" << ":/PCBSD/images/xfce.png"; 
    678678    wheelName << "FreeBSD Server" << "TrueOS" << "KDE" << "LXDE" << "GNOME" << "XFCE";  
    679679    wheelDesc << tr("FreeBSD is an advanced operating system for modern server, desktop, and embedded computer platforms. FreeBSD's code base has undergone over thirty years of continuous development, improvement, and optimization.") \ 
     
    763763 
    764764   // Start the FreeBSD wizard 
    765    if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == wPCSERVER || wheelCurItem == 12) ) { 
     765   if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wPCSERVER || wheelCurItem == 12) ) { 
    766766     bool tOS; 
    767767     if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 ) 
     
    892892 
    893893  // If we are doing a PC-BSD install 
    894   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) { 
     894  if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
    895895    tmpList << "installType=PCBSD"; 
    896896    tmpList << "packageType=dist"; 
     
    910910   
    911911  // Networking setup 
    912   if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
     912  if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
    913913    // PC-BSD network setup 
    914914    tmpList << "netSaveDev=AUTO-DHCP-SLAAC"; 
     
    10151015  cfgList+= ""; 
    10161016 
    1017   if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
     1017  if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
    10181018    // Doing PC-BSD Install 
    10191019 
     
    10441044    cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server"; 
    10451045 
    1046   } else { // End of PC-BSD specific setup 
    1047     // Doing FreeBSD Install 
    1048     cfgList+=getUsersCfgSettings(); 
    1049  
    1050     // Enable SSH? 
    1051     if ( fSSH ) 
    1052       cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf"; 
    1053  
    1054   } 
     1046  }  
    10551047 
    10561048  // Run newaliases to fix mail errors 
     
    15461538QStringList Installer::getDeskPkgCfg() 
    15471539{ 
    1548    if ( wheelCurItem == wFREEBSD ) 
    1549       return QStringList(); 
    1550  
    15511540   QStringList cfgList, pkgList; 
    15521541   QString line; 
     
    16641653  //qDebug() << totalSize; 
    16651654 
    1666   if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == wPCSERVER || wheelCurItem == 12) ) 
     1655  if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wPCSERVER || wheelCurItem == 12) ) 
    16671656     targetSize=20000; 
    16681657  else 
  • src-qt4/pc-installgui/installer.h

    r1620346 rda7c222  
    1818#include "wizardDisk.h" 
    1919 
    20 #define wFREEBSD 1 
    2120#define wPCSERVER 2 
    2221#define wKDE 3 
Note: See TracChangeset for help on using the changeset viewer.