Changeset 850f9fa


Ignore:
Timestamp:
05/17/13 17:36:07 (18 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, releng/10.1
Children:
794e0d2
Parents:
da99d41
Message:

Fix up the FreeBSD installation option, now GUI will respect no-fbsd flag
and hide the option if the media isn't on the disk

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

Legend:

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

    r003d28c r850f9fa  
    574574  if ( direction && wheelCurItem >= wheelIcons.size() ) 
    575575    return; 
    576   if ( ! direction && wheelCurItem <= 2 ) 
    577     return; 
     576  if ( hasFreeBSDOnMedia ) { 
     577    if ( ! direction && wheelCurItem <= 1 ) 
     578      return; 
     579  } else { 
     580    if ( ! direction && wheelCurItem <= 2 ) 
     581      return; 
     582  } 
    578583 
    579584 
     
    674679void Installer::initDesktopSelector() 
    675680{ 
     681    QString fbsdIcon; 
     682 
     683    if ( hasFreeBSDOnMedia ) 
     684       fbsdIcon = ":modules/images/freebsd.png"; 
     685    else 
     686       fbsdIcon = ""; 
     687 
    676688    // Init the desktop selector 
    677     wheelIcons << "" << ":/modules/images/pcbsd-server.png" << ":/PCBSD/images/kde.png" << ":/PCBSD/images/lxde.png" << ":/PCBSD/images/gnome.png" << ":/PCBSD/images/xfce.png"; 
     689    wheelIcons << fbsdIcon << ":/modules/images/pcbsd-server.png" << ":/PCBSD/images/kde.png" << ":/PCBSD/images/lxde.png" << ":/PCBSD/images/gnome.png" << ":/PCBSD/images/xfce.png"; 
    678690    wheelName << "FreeBSD Server" << "TrueOS" << "KDE" << "LXDE" << "GNOME" << "XFCE";  
    679691    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.") \ 
     
    763775 
    764776   // Start the FreeBSD wizard 
    765    if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wPCSERVER || wheelCurItem == 12) ) { 
     777   if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == wPCSERVER || wheelCurItem == 12) ) { 
    766778     bool tOS; 
    767779     if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 ) 
     
    892904 
    893905  // If we are doing a PC-BSD install 
    894   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
     906  if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) { 
    895907    tmpList << "installType=PCBSD"; 
    896908    tmpList << "packageType=dist"; 
     
    910922   
    911923  // Networking setup 
    912   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
     924  if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
    913925    // PC-BSD network setup 
    914926    tmpList << "netSaveDev=AUTO-DHCP-SLAAC"; 
     
    10151027  cfgList+= ""; 
    10161028 
    1017   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
     1029  if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) { 
    10181030    // Doing PC-BSD Install 
    10191031 
     
    10441056    cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server"; 
    10451057 
    1046   }  
     1058  } else { // End of PC-BSD specific setup 
     1059    // Doing FreeBSD Install 
     1060    cfgList+=getUsersCfgSettings(); 
     1061 
     1062    // Enable SSH? 
     1063    if ( fSSH ) 
     1064      cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf"; 
     1065 
     1066  } 
    10471067 
    10481068  // Run newaliases to fix mail errors 
     
    15381558QStringList Installer::getDeskPkgCfg() 
    15391559{ 
     1560   if ( wheelCurItem == wFREEBSD ) 
     1561      return QStringList(); 
     1562 
    15401563   QStringList cfgList, pkgList; 
    15411564   QString line; 
  • src-qt4/pc-installgui/installer.h

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