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

[svn at pcbsd.org]

Author: kris
Date: 2012-12-10 17:51:21 +0000 (Mon, 10 Dec 2012)
New Revision: 20455

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

Switch to using dist files during installation



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-10 17:44:20 UTC (rev 20454)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-10 17:51:21 UTC (rev 20455)
@@ -864,30 +864,29 @@
     // Doing a fresh install
     tmpList << "installMode=fresh";
   }
+  
+  QString distFiles;
+  distFiles="base doc games kernel";
+  if ( Arch == "amd64" )
+     distFiles+=" lib32";
 
   // If we are doing a PC-BSD install
   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) {
     tmpList << "installType=PCBSD";
-
-    // If installing from a install media, use tar, otherwise uzip
-    if (!isLiveMode)
-      tmpList << "packageType=tar";
-    else
-      tmpList << "packageType=uzip";
-
-    tmpList << "installFile=PCBSD.txz";
-
-    tmpList << "";
+    tmpList << "packageType=tar";
+    distFiles+=" pcbsd";
   } else {
     tmpList << "installType=FreeBSD";
     tmpList << "packageType=tar";
     // If we are doing TrueOS server or FreeBSD server
     if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 )
-      tmpList << "installFile=PCBSD-Server.txz";
-    else
-      tmpList << "installFile=fbsd-release.txz";
+       distFiles+=" trueos";
   }
 
+  // Set the distFiles being used
+  tmpList << "distFiles=" + distFiles;
+  tmpList << "";
+
   // If we have a custom hostname, add it to the config
   if ( ! fHost.isEmpty() )
     tmpList << "hostname=" + fHost;