[PC-BSD Commits] r7879 - in pcbsd: current/src-qt4/pc-sysinstaller stable/SysInstaller

svn at pcbsd.org svn at pcbsd.org
Fri Oct 22 10:29:32 PDT 2010


Author: kris
Date: 2010-10-22 10:29:32 -0700 (Fri, 22 Oct 2010)
New Revision: 7879

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp
   pcbsd/stable/SysInstaller/dialogFileSystem.cpp
Log:

Updated installer, don't need to ask for passphrase for SWAP partition



Modified: pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp	2010-10-22 17:22:24 UTC (rev 7878)
+++ pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp	2010-10-22 17:29:32 UTC (rev 7879)
@@ -103,7 +103,7 @@
 // Function which toggles encryption enable / disable for regular UFS
 void dialogFileSystem::slotEncryptionChanged()
 {
-  if(checkEncryption->isChecked() ) {
+  if(checkEncryption->isChecked() && comboDiskType->currentText() != "SWAP" ) {
     if( getEncPhrase() )
       checkEncryptionZFS->setChecked(TRUE);
   } else {

Modified: pcbsd/stable/SysInstaller/dialogFileSystem.cpp
===================================================================
--- pcbsd/stable/SysInstaller/dialogFileSystem.cpp	2010-10-22 17:22:24 UTC (rev 7878)
+++ pcbsd/stable/SysInstaller/dialogFileSystem.cpp	2010-10-22 17:29:32 UTC (rev 7879)
@@ -102,7 +102,7 @@
 // Function which toggles encryption enable / disable for regular UFS
 void dialogFileSystem::slotEncryptionChanged()
 {
-  if(checkEncryption->isChecked() ) {
+  if(checkEncryption->isChecked() && comboDiskType->currentText() != "SWAP" ) {
     if( getEncPhrase() )
       checkEncryptionZFS->setChecked(TRUE);
   } else {



More information about the Commits mailing list