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

[svn at pcbsd.org]

Author: kris
Date: 2012-02-17 17:37:47 +0000 (Fri, 17 Feb 2012)
New Revision: 15467

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

Write the correct pc-sysinstall config when doing expert manual mode



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-02-17 15:55:03 UTC (rev 15466)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-02-17 17:37:47 UTC (rev 15467)
@@ -773,8 +773,14 @@
   tmpList << "# Auto-Generated pc-sysinstall configuration";
   tmpList << "installInteractive=no";
 
-  // Doing a fresh install
-  tmpList << "installMode=fresh";
+  if ( sysFinalDiskLayout.at(0).at(0) == "MANUAL" )
+  {
+    tmpList << "installMode=extract";
+    tmpList << "installLocation=/mnt";
+  } else {
+    // Doing a fresh install
+    tmpList << "installMode=fresh";
+  }
 
   // If we are doing a PC-BSD install
   if ( wheelCurItem != wFREEBSD ) {
@@ -983,6 +989,10 @@
   // Copy over the list to a new variable we can mangle without modifying the original
   copyList = sysFinalDiskLayout;
 
+  // Doing manual extraction
+  if ( copyLayout.at(0).at(0) == "MANUAL" )
+    return QStringList();
+
   while ( ! copyList.empty() )
   {
     workingDisk = copyList.at(0).at(0);