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

[svn at pcbsd.org]

Author: kris
Date: 2012-08-17 19:33:23 +0000 (Fri, 17 Aug 2012)
New Revision: 18480

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

Change our raidz drive settings to support the following configs:

Start a RAIDZ1 at 3 or 5 disks. 

Start a RAIDZ2 at 4, 6, or 10 disks. 

Start a RAIDZ3 at 5, 7, or 11 disks. 



Modified: pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-08-17 19:27:37 UTC (rev 18479)
+++ pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-08-17 19:33:23 UTC (rev 18480)
@@ -264,34 +264,34 @@
             }
          }
 	 if ( comboZFSMode->currentText() == "raidz1" ) {
-            labelZFSMsg->setText(tr("Please select at least 2 other drives for raidz1"));
+            labelZFSMsg->setText(tr("Please select 2 or 4 additional drives for raidz1"));
 	    int numChecked = 0;
 	    for ( int i = 0; i < listZFSDisks->count(); ++i )
 		if ( listZFSDisks->item(i)->checkState() == Qt::Checked )
 		   numChecked++;
-            if ( numChecked >= 2 ) {
+            if ( numChecked == 2 || numChecked == 4 ) {
               button(QWizard::NextButton)->setEnabled(true);
 	      return true;
             }
          }
 	 if ( comboZFSMode->currentText() == "raidz2" ) {
-            labelZFSMsg->setText(tr("Please select at least 5 other drives for raidz2"));
+            labelZFSMsg->setText(tr("Please select 3, 5, or 9 additional drives for raidz2"));
 	    int numChecked = 0;
 	    for ( int i = 0; i < listZFSDisks->count(); ++i )
 		if ( listZFSDisks->item(i)->checkState() == Qt::Checked )
 		   numChecked++;
-            if ( numChecked >= 5 ) {
+            if ( numChecked == 3 || numChecked == 5 || numChecked == 9 ) {
               button(QWizard::NextButton)->setEnabled(true);
 	      return true;
             }
          }
 	 if ( comboZFSMode->currentText() == "raidz3" ) {
-            labelZFSMsg->setText(tr("Please select at least 8 other drives for raidz3"));
+            labelZFSMsg->setText(tr("Please select 4, 6, or 10 additional drives for raidz3"));
 	    int numChecked = 0;
 	    for ( int i = 0; i < listZFSDisks->count(); ++i )
 		if ( listZFSDisks->item(i)->checkState() == Qt::Checked )
 		   numChecked++;
-            if ( numChecked >= 8 ) {
+            if ( numChecked == 4 || numChecked == 6 || numChecked == 10 ) {
               button(QWizard::NextButton)->setEnabled(true);
 	      return true;
             }