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

[svn at pcbsd.org]

Author: kris
Date: 2009-12-28 13:38:01 -0800 (Mon, 28 Dec 2009)
New Revision: 5703

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

Updated SysInstaller to display a warning when using encryption about copying the generated keys files



Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2009-12-28 21:27:04 UTC (rev 5702)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2009-12-28 21:38:01 UTC (rev 5703)
@@ -84,12 +84,13 @@
   // End of auto-partition checks
   }  else {
   // Check if if the disk layout is good when using custom partitioning
-    bool haveRoot, haveUsr, haveVar, haveSwap;
+    bool haveRoot, haveUsr, haveVar, haveSwap, haveEncryption;
     int minRoot, minUsr, minVar;
     haveRoot = false;
     haveUsr = false;
     haveVar = false;
     haveSwap = false;
+    haveEncryption = false;
 
     if ( radioInstallPCBSD->isChecked() ) {
       minRoot = PCBSD_MINROOT;
@@ -112,6 +113,9 @@
        if ( sysFinalDiskLayout.at(i).at(3) == "SWAP" \
             || sysFinalDiskLayout.at(i).at(3) == "SWAP.eli" )
          haveSwap = true;
+       if ( sysFinalDiskLayout.at(i).at(3).indexOf(".eli") != -1 
+            && sysFinalDiskLayout.at(i).at(3).indexOf("SWAP") == -1 )
+         haveEncryption = true;
     }
 
     if (!haveRoot) {
@@ -127,6 +131,12 @@
       return false;
     }
 
+    if (haveEncryption) {
+      QMessageBox::warning(this, tr("PC-BSD Installer"),
+         tr("Encryption is enabled! Keys are randomly generated and will be stored in /boot/keys/. You should immediately make a backup copy of these keys, or else data loss could occur should they be corrupted."),
+         QMessageBox::Ok);
+    }
+
     // Check if we have mounts for usr / var, and if not, add their requirements to /
     if (!haveVar)
       minRoot = minRoot + minVar;