Fix installing src / ports if chosen

src-qt4/pc-installgui/installer.cpp

@@ -876,6 +876,12 @@ QStringList Installer::getGlobalCfgSettings()
   if ( Arch == "amd64" )
      distFiles+=" lib32";
 
+  // Check for ports / src sources
+  if ( fSRC )
+     distFiles+=" src";
+  if ( fPORTS )
+     distFiles+=" ports";
+
   // System type we are installing
   if ( radioDesktop->isChecked() )
     tmpList << "installType=PCBSD";
@@ -996,8 +1002,6 @@ void Installer::startConfigGen()
   // We can skip these options if doing a restore
   if ( ! radioRestore->isChecked() ) {
 
-    cfgList+=getComponentCfgSettings();
-
     // Save the install config script to disk
     cfgList << "runExtCommand=/root/save-config.sh";
 
@@ -1565,24 +1569,6 @@ void Installer::slotReadInstallerOutput()
   } // end of while loop
 }
 
-// Return list of components to install
-QStringList Installer::getComponentCfgSettings()
-{
-  QStringList componentList, com;
-  if ( fSRC )
-    com << "src";
-  if ( fPORTS )
-    com << "ports";
-
-  if ( ! com.isEmpty() ) {
-    componentList << "";
-    componentList << "# Optional Components";
-    componentList << "installComponents=" + com.join(",");
-  }
-
-  return componentList;
-}
-
 // Start xvkbd
 void Installer::slotPushVirtKeyboard()
 {

src-qt4/pc-installgui/installer.h

@@ -98,7 +98,6 @@ private slots:
     // Functions which return parts of the config file
     QStringList getGlobalCfgSettings();
     QStringList getDiskCfgSettings();
-    QStringList getComponentCfgSettings();
 
     void startConfigGen(); // Function which takes pieces of cfg, and assembles
     void checkSpaceWarning(); // Function to check space of disk drive