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

[svn at pcbsd.org]

Author: kris
Date: 2012-07-19 19:32:54 +0000 (Thu, 19 Jul 2012)
New Revision: 17822

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

Only auto-enable ZFS if not on i386



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-07-19 19:25:17 UTC (rev 17821)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-07-19 19:32:54 UTC (rev 17822)
@@ -212,7 +212,7 @@
      mntsize = 2000;
 
      // If less than 2GB of memory, lets go with UFS+SUJ
-     if ( systemMemory < 2028 ) {
+     if ( systemMemory < 2028 || Arch == "i386" ) {
        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-07-19 19:25:17 UTC (rev 17821)
+++ pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-07-19 19:32:54 UTC (rev 17822)
@@ -44,9 +44,19 @@
   connect(listZFSDisks,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(slotCheckComplete()));
   connect(listZFSDisks,SIGNAL(itemChanged(QListWidgetItem *)),this,SLOT(slotCheckComplete()));
 
+  // Get the system arch type
+  QProcess m;
+  m.start(QString("uname"), QStringList() << "-m");
+  while(m.state() == QProcess::Starting || m.state() == QProcess::Running) {
+     m.waitForFinished(200);
+     QCoreApplication::processEvents();
+  }
+  // Get output
+  QString Arch = m.readLine().simplified();
+
   // Set the suggested FileSystem
   systemMemory = Scripts::Backend::systemMemory();
-  if ( systemMemory > 2028 )
+  if ( systemMemory > 2028 && Arch != "i386" )
     radioZFS->setChecked(true);
   else
     radioUFS->setChecked(true);