[PC-BSD Commits] r8154 - pcbsd/stable/SysInstaller
svn at pcbsd.org
svn at pcbsd.org
Mon Dec 6 14:46:26 PST 2010
Author: kris
Date: 2010-12-06 14:46:26 -0800 (Mon, 06 Dec 2010)
New Revision: 8154
Modified:
pcbsd/stable/SysInstaller/sys-diskwidget.cpp
pcbsd/stable/SysInstaller/sysinstaller.ui
Log:
MFC checkbox for setting if using MBR/GPT on full disk installations
Modified: pcbsd/stable/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/stable/SysInstaller/sys-diskwidget.cpp 2010-12-06 22:38:23 UTC (rev 8153)
+++ pcbsd/stable/SysInstaller/sys-diskwidget.cpp 2010-12-06 22:46:26 UTC (rev 8154)
@@ -144,10 +144,24 @@
}
}
} else if ( listDiskSlices->currentItem() ){
+
// Using a specific partition, check that size
QString slice = listDiskSlices->currentItem()->text();
slice.truncate(slice.indexOf(":"));
+
+ // Make sure this isn't Unused Space we are trying to install to
+ for (int i=0; i < sysDisks.count(); ++i) {
+ if ( sysDisks.at(i).at(0) == "SLICE" && slice == sysDisks.at(i).at(2) \
+ && sysDisks.at(i).at(4) == "Unused Space") {
+ QMessageBox::critical(this, tr("PC-BSD Installer Error"),
+ tr("Please create a partition using the 'Add Partition' button below, to install using free space.")
+,
+ QMessageBox::Ok);
+ return false;
+ }
+ }
+
// Get the Disk
for (int i=0; i < sysDisks.count(); ++i)
if ( sysDisks.at(i).at(0) == "SLICE" && slice == sysDisks.at(i).at(2))
@@ -580,6 +594,13 @@
else
tmpList << "bootManager=none";
+ // If this is a dedicated disk, mark if using MBR/GPT
+ if ( tmpSlice == "ALL" ) {
+ if ( checkDiskGPT->isChecked() )
+ tmpList << "partscheme=GPT";
+ else
+ tmpList << "partscheme=MBR";
+ }
// Check for any mirror for this device
for (int i=0; i < copyList.count(); ++i) {
Modified: pcbsd/stable/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/stable/SysInstaller/sysinstaller.ui 2010-12-06 22:38:23 UTC (rev 8153)
+++ pcbsd/stable/SysInstaller/sysinstaller.ui 2010-12-06 22:46:26 UTC (rev 8154)
@@ -996,7 +996,7 @@
</palette>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>3</number>
</property>
<widget class="QWidget" name="aiStep0">
<property name="palette">
@@ -7814,7 +7814,7 @@
</widget>
<widget class="QWidget" name="aiStep3">
<layout class="QGridLayout" name="gridLayout_28">
- <item row="0" column="0" rowspan="6">
+ <item row="0" column="0" rowspan="5">
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -7827,41 +7827,28 @@
</property>
</spacer>
</item>
- <item row="0" column="2">
- <spacer name="verticalSpacer_29">
+ <item row="1" column="1">
+ <spacer name="horizontalSpacer_6">
<property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>528</width>
- <height>4</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="4" rowspan="4">
- <spacer name="horizontalSpacer_37">
- <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>43</width>
- <height>435</height>
+ <width>56</width>
+ <height>28</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="1">
- <spacer name="horizontalSpacer_6">
+ <item row="0" column="2">
+ <spacer name="verticalSpacer_29">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>56</width>
- <height>28</height>
+ <width>528</width>
+ <height>4</height>
</size>
</property>
</spacer>
@@ -7936,6 +7923,19 @@
</property>
</spacer>
</item>
+ <item row="0" column="4" rowspan="4">
+ <spacer name="horizontalSpacer_37">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>43</width>
+ <height>435</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item row="2" column="1" colspan="3">
<spacer name="verticalSpacer_28">
<property name="orientation">
@@ -8356,7 +8356,7 @@
</layout>
</widget>
</item>
- <item row="4" column="1" colspan="4">
+ <item row="4" column="1" rowspan="2">
<spacer name="verticalSpacer_30">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -8369,7 +8369,7 @@
</property>
</spacer>
</item>
- <item row="6" column="2">
+ <item row="5" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_12">
@@ -8417,9 +8417,19 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QCheckBox" name="checkDiskGPT">
+ <property name="toolTip">
+ <string>Enable this option if you with to use the GPT/EFI partition scheme for dedicated disks. Normally only needs to be enabled on 2TB+ disks. Warning: May not work with older BIOS/Motherboards. </string>
+ </property>
+ <property name="text">
+ <string>Partition with GPT for full disk install</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
- <item row="7" column="1" colspan="3">
+ <item row="6" column="1">
<spacer name="verticalSpacer_26">
<property name="orientation">
<enum>Qt::Vertical</enum>
More information about the Commits
mailing list