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

[svn at pcbsd.org]

Author: kris
Date: 2010-12-01 10:44:40 -0800 (Wed, 01 Dec 2010)
New Revision: 8123

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

Fixed a bug when selecting a partition to install to, even if the disk has GPT on it, there may
be additional MBR partitions we can use, such as on a macbook

Reported by: mjanosi (Via forums)



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-diskwidget.cpp	2010-12-01 17:52:26 UTC (rev 8122)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-diskwidget.cpp	2010-12-01 18:44:40 UTC (rev 8123)
@@ -167,7 +167,7 @@
           disk = sysDisks.at(i).at(1);
 
       // Make sure this isn't a GPT slice / partition
-      if ( getDiskScheme(disk) != "MBR" ) {
+      if ( disk+"s1" != slice && disk+"s2" != slice && disk+"s3" != slice && disk+"s4" != slice ) {
         QMessageBox::critical(this, tr("PC-BSD Installer Error"),
         tr("Can only install directly to a MBR partition!\nPlease use 'entire disk' or delete all partitions and create a new one."),
         QMessageBox::Ok);

Modified: pcbsd/stable/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/stable/SysInstaller/sys-diskwidget.cpp	2010-12-01 17:52:26 UTC (rev 8122)
+++ pcbsd/stable/SysInstaller/sys-diskwidget.cpp	2010-12-01 18:44:40 UTC (rev 8123)
@@ -154,7 +154,7 @@
           disk = sysDisks.at(i).at(1);
 
       // Make sure this isn't a GPT slice / partition
-      if ( getDiskScheme(disk) != "MBR" ) {
+      if ( disk+"s1" != slice && disk+"s2" != slice && disk+"s3" != slice && disk+"s4" != slice ) {
         QMessageBox::critical(this, tr("PC-BSD Installer Error"),
         tr("Can only install directly to a MBR partition!\nPlease use 'entire disk' or delete all partitions and create a new one."),
         QMessageBox::Ok);