[PC-BSD Commits] r17454 - pcbsd/current/src-qt4/pc-installgui

svn at pcbsd.org svn at pcbsd.org
Tue Jun 26 09:25:00 PDT 2012


Author: kris
Date: 2012-06-26 16:24:59 +0000 (Tue, 26 Jun 2012)
New Revision: 17454

Modified:
   pcbsd/current/src-qt4/pc-installgui/installer.cpp
   pcbsd/current/src-qt4/pc-installgui/installer.h
Log:

Add FreeBSD vanilla as a server install option, along side our PC-BSD
server offering. 



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-26 15:15:55 UTC (rev 17453)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-26 16:24:59 UTC (rev 17454)
@@ -427,7 +427,7 @@
 void Installer::slotDesktopCustomizeClicked()
 {
   desks = new desktopSelection();
-  if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 )
+  if ( wheelCurItem != wPCSERVER && wheelCurItem != 11 )
      desks->programInit(listDeskPkgs,selectedPkgs);
   else
      desks->programInit(listServerPkgs,selectedPkgs);
@@ -546,6 +546,12 @@
   wheelCurItem=tItem;
   groupDeskSummary->setTitle(wheelName.at(tItem-1));
   textDeskSummary->setText(wheelDesc.at(tItem-1));
+
+  // No custom packages for FreeBSD vanilla
+  if ( wheelCurItem == 1 ) 
+    pushDeskCustomize->setEnabled(false);
+  else
+    pushDeskCustomize->setEnabled(true);
   
   changeMetaPkgSelection();
 }
@@ -603,9 +609,10 @@
 void Installer::initDesktopSelector()
 {
     // Init the desktop selector
-    wheelIcons << ":/modules/images/pcbsd-server.png" << ":/PCBSD/images/kde.png" << ":/PCBSD/images/lxde.png" << ":/PCBSD/images/gnome.png" << ":/PCBSD/images/xfce.png";
-    wheelName << "PC-BSD Server" << "KDE" << "LXDE" << "GNOME" << "XFCE"; 
-    wheelDesc << tr("The PC-BSD Server is a console based server OS based upon FreeBSD. It includes the command-line versions of the PBI manager and Meta Package manager for managing your server software.")  \
+    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";
+    wheelName << "FreeBSD Server" << "PC-BSD Server" << "KDE" << "LXDE" << "GNOME" << "XFCE"; 
+    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.") \
+    << tr("The PC-BSD Server is a console based system running FreeBSD. It includes command-line versions of The Warden jail management, PBI manager, system updater and other helpful utilities for system administrators.")  \
     << tr("KDE is a full-featured desktop environment, which includes support for 3D desktop effects, multiple desktops, and a variety of built-in tools and utilities for both new and power-desktop users.<br><br>* Recommended for higher-end systems with 2GB of RAM or more *") \
     << tr("LXDE is a lightweight desktop, minimalist in nature, with support for multiple-desktops, a system tray, application menu and more.<br><br>* Recommended for netbooks, or lower-end systems * ") \
     << tr("GNOME is a full-featured desktop environment, complete with a large number of integrated utilities and tools for desktop users.") \
@@ -621,9 +628,9 @@
 
     // If less than 2GB memory, default to LXDE, otherwise KDE
     if ( systemMemory > 2048 ) 
-      wheelCurItem=1;
+      wheelCurItem=2;
     else
-      wheelCurItem=2;
+      wheelCurItem=3;
     graphicsViewOS->centerOn(191,0);
     graphicsViewOS->show();
     moveDesktopWheel(true);
@@ -689,7 +696,7 @@
    }
 
    // Start the FreeBSD wizard
-   if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == 11) ) {
+   if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == wPCSERVER || wheelCurItem == 12) ) {
      wFBSD = new wizardFreeBSD();
      wFBSD->setWindowModality(Qt::ApplicationModal);
      wFBSD->programInit();
@@ -809,7 +816,7 @@
   }
 
   // If we are doing a PC-BSD install
-  if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 ) {
+  if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) {
     tmpList << "installType=PCBSD";
 
     // If installing from a install media, use tar, otherwise uzip
@@ -818,10 +825,17 @@
     else
       tmpList << "packageType=uzip";
 
+    tmpList << "installFile=PCBSD.txz";
+
     tmpList << "";
   } else {
     tmpList << "installType=FreeBSD";
     tmpList << "packageType=tar";
+    // If we are doing PC-BSD server or FreeBSD server
+    if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 )
+      tmpList << "installFile=PCBSD-Server.txz";
+    else
+      tmpList << "installFile=fbsd-release.txz";
   }
 
   // If we have a custom hostname, add it to the config
@@ -830,7 +844,7 @@
 
   
   // Networking setup
-  if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 ) {
+  if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) {
     // PC-BSD network setup
     tmpList << "netSaveDev=AUTO-DHCP-SLAAC";
   } else {
@@ -924,7 +938,7 @@
   cfgList << "runExtCommand=/root/save-config.sh";
 
   // If this is a PC-BSD Install, do a few extra commands after everything else
-  if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 ) {
+  if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) {
 
     // First mount /dev inside chroot
     cfgList << "runExtCommand=mount -t devfs devfs ${FSMNT}/dev";
@@ -1467,15 +1481,18 @@
 // Return the configuration for desktop packages
 QStringList Installer::getDeskPkgCfg()
 {
+   if ( wheelCurItem == wFREEBSD )
+      return QStringList();
+
    QStringList cfgList;
    QString cfgLine;
-   if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 )
+   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 )
      cfgLine="runExtCommand=sh /root/insMetaPkgs.sh base-system";
    else
      cfgLine="runExtCommand=sh /root/insMetaPkgs.sh ";
 
    for ( int i=0; i<selectedPkgs.count(); ++i) {
-       if ( i == 0 && (wheelCurItem == wFREEBSD || wheelCurItem == 11) )
+       if ( i == 0 && (wheelCurItem == wPCSERVER || wheelCurItem == 12) )
          cfgLine+= selectedPkgs.at(i);
        else
          cfgLine+="," + selectedPkgs.at(i);
@@ -1483,7 +1500,7 @@
 
    cfgLine += " CD";
 
-   if ( wheelCurItem != wFREEBSD && wheelCurItem != 11 )
+   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 )
      cfgLine += " pcbsd";
    else
      cfgLine += " warden";

Modified: pcbsd/current/src-qt4/pc-installgui/installer.h
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.h	2012-06-26 15:15:55 UTC (rev 17453)
+++ pcbsd/current/src-qt4/pc-installgui/installer.h	2012-06-26 16:24:59 UTC (rev 17454)
@@ -16,10 +16,11 @@
 #include "wizardDisk.h"
 
 #define wFREEBSD 1
-#define wKDE 2
-#define wLXDE 3
-#define wGNOME 4
-#define wXFCE 5
+#define wPCSERVER 2
+#define wKDE 3
+#define wLXDE 4
+#define wGNOME 5
+#define wXFCE 6
 
 #include "backend.h"
 



More information about the Commits mailing list