[PC-BSD Commits] r2561 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2008-08-08 07:16:29 -0700 (Fri, 08 Aug 2008)
New Revision: 2561

Modified:
   pcbsd/trunk/PCInstall/pcinstall.cpp
Log:

Fixed a minor display bug in the custom partitioning screen, now shows the right file system type for partition a



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-08-07 23:35:15 UTC (rev 2560)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-08-08 14:16:29 UTC (rev 2561)
@@ -1663,25 +1663,35 @@
 	switch( i ) {
 	   case 0:
 	       PartLetter = "a";
-	       Type = "UFS2";
+               tmp = comboFileSystem->currentText();
+               if ( tmp.indexOf("ZFS") == -1)
+               {
+                 Type = tmp; 
+               } else {
+	         Type = "UFS2";
+               }
 	       break;
 	   case 1:
 	       PartLetter = "b";
 	       Type = "Swap";
 	       break;
 	   case 2:
+	       PartLetter = "d";
+	       Type = comboFileSystem->currentText();
+	       break;
+	   case 3:
 	       PartLetter = "e";
 	       Type = comboFileSystem->currentText();
 	       break;
-	   case 3:
+	   case 4:
 	       PartLetter = "f";
 	       Type = comboFileSystem->currentText();
 	       break;
-	   case 4:
+	   case 5:
 	       PartLetter = "g";
 	       Type = comboFileSystem->currentText();
 	       break;
-	   case 5:
+	   case 6:
 	       PartLetter = "h";
 	       Type = comboFileSystem->currentText();
 	       break;