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

[svn at pcbsd.org]

Author: kris
Date: 2012-06-15 15:03:41 +0000 (Fri, 15 Jun 2012)
New Revision: 17289

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

Change defaults on ZFS auto-enabling. Now if you have less than 1GB of memory,
disable ZFS option. If you have 2GB+ enable it by default, so we can use
BEADM goodness, snapshots, etc. 



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-15 14:29:01 UTC (rev 17288)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-15 15:03:41 UTC (rev 17289)
@@ -183,8 +183,8 @@
   {
      mntsize = 2000;
 
-     // If less than 4GB of memory, lets go with UFS+SUJ
-     if ( systemMemory < 4000 ) {
+     // If less than 2GB of memory, lets go with UFS+SUJ
+     if ( systemMemory < 2028 ) {
        fsType="UFS+SUJ";
 
        fileSystem << targetDisk << targetSlice << "/" << fsType << tmp.setNum(mntsize) << "" << "";

Modified: pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-06-15 14:29:01 UTC (rev 17288)
+++ pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-06-15 15:03:41 UTC (rev 17289)
@@ -46,10 +46,13 @@
 
   // Set the suggested FileSystem
   systemMemory = Scripts::Backend::systemMemory();
-  if ( systemMemory > 4028 )
+  if ( systemMemory > 2028 )
     radioZFS->setChecked(true);
   else
     radioUFS->setChecked(true);
+  
+  if ( systemMemory > 1028 )
+    radioZFS->setEnabled(false);
 
 }