[PC-BSD Commits] r6465 - pcbsd/trunk/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-03-29 08:20:44 -0700 (Mon, 29 Mar 2010)
New Revision: 6465

Modified:
   pcbsd/trunk/SysInstaller/dialogFileSystem.cpp
   pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
Log:

Fixed a bug in pc-sysinstall config file generation with passphrases



Modified: pcbsd/trunk/SysInstaller/dialogFileSystem.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/dialogFileSystem.cpp	2010-03-29 15:04:56 UTC (rev 6464)
+++ pcbsd/trunk/SysInstaller/dialogFileSystem.cpp	2010-03-29 15:20:44 UTC (rev 6465)
@@ -807,7 +807,7 @@
     sysFinalDiskLayout[editIndex][3] = fsType;
     sysFinalDiskLayout[editIndex][4] = Size;
     sysFinalDiskLayout[editIndex][5] = XtraOpts;
-    sysFinalDiskLayout[editIndex][5] = encPhrase;
+    sysFinalDiskLayout[editIndex][6] = encPhrase;
   } else {
     // Add a new Device
     fileSystem << Disk << Slice << Mount << fsType << Size << XtraOpts << encPhrase;

Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-29 15:04:56 UTC (rev 6464)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-29 15:20:44 UTC (rev 6465)
@@ -539,6 +539,10 @@
                  + copyList.at(i).at(3) + " " + copyList.at(i).at(4) \
                  + " " + copyList.at(i).at(2) + XtraTmp;
 
+        // Check if we have an encryption passphrase to use
+        if ( ! copyList.at(i).at(6).isEmpty() )
+          tmpList << "encpass=" + copyList.at(i).at(6);
+
         // Write the user summary
         summaryList << "";
         summaryList << tr("Partition:") + " " + workingDisk + "(" + workingSlice + "):";