mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2025-01-20 07:19:18 +01:00
CP-28679: XC: Allow choosing boot options during disk import (#2203)
* CP-28679: XC: Allow choosing boot options during disk import Signed-off-by: Tim Liu <tim.liu@citrix.com> * CP-28679: XC: Allow choosing boot options during disk import 1. Keep spaces instead of tabs 2. Update page header text to reflect the new control 3. Refine UI Signed-off-by: Tim Liu <tim.liu@citrix.com>
This commit is contained in:
Tim Liu
Konstantina Chremmou
parent
a1033de3a4
commit
685a53bc22
2
XenAdmin/Wizards/BootModesControl.Designer.cs
generated
2
XenAdmin/Wizards/BootModesControl.Designer.cs
generated
@ -64,9 +64,7 @@ namespace XenAdmin.Wizards
|
||||
// radioButtonBIOSBoot
|
||||
//
|
||||
resources.ApplyResources(this.radioButtonBIOSBoot, "radioButtonBIOSBoot");
|
||||
this.radioButtonBIOSBoot.Checked = true;
|
||||
this.radioButtonBIOSBoot.Name = "radioButtonBIOSBoot";
|
||||
this.radioButtonBIOSBoot.TabStop = true;
|
||||
this.radioButtonBIOSBoot.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// radioButtonUEFIBoot
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Forms;
|
||||
using XenAPI;
|
||||
using BootMode = XenAdmin.Actions.VMActions.BootMode;
|
||||
@ -42,6 +43,7 @@ namespace XenAdmin.Wizards
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
|
||||
public VM TemplateVM
|
||||
{
|
||||
get { return _templateVM; }
|
||||
@ -76,7 +78,12 @@ namespace XenAdmin.Wizards
|
||||
|
||||
public BootMode SelectedOption
|
||||
{
|
||||
get { return radioButtonUEFISecureBoot.Checked ? BootMode.UEFI_SECURE_BOOT: (radioButtonUEFIBoot.Checked ? BootMode.UEFI_BOOT : BootMode.BIOS_BOOT); }
|
||||
get { return radioButtonUEFISecureBoot.Checked ? BootMode.UEFI_SECURE_BOOT : (radioButtonUEFIBoot.Checked ? BootMode.UEFI_BOOT : BootMode.BIOS_BOOT); }
|
||||
}
|
||||
|
||||
public void CheckBIOSBootMode()
|
||||
{
|
||||
radioButtonBIOSBoot.Checked = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
this.m_upDownAddSpace = new System.Windows.Forms.NumericUpDown();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.m_ctrlError = new XenAdmin.Controls.Common.PasswordFailure();
|
||||
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.bootModesControl1 = new XenAdmin.Wizards.BootModesControl();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.m_upDownCpuCount)).BeginInit();
|
||||
@ -67,6 +67,7 @@
|
||||
this.tableLayoutPanel1.Controls.Add(this.label4, 2, 4);
|
||||
this.tableLayoutPanel1.Controls.Add(this.m_groupBoxAddSpace, 0, 6);
|
||||
this.tableLayoutPanel1.Controls.Add(this.m_ctrlError, 0, 8);
|
||||
this.tableLayoutPanel1.Controls.Add(this.bootModesControl1, 0, 5);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
//
|
||||
// lblIntro
|
||||
@ -207,10 +208,12 @@
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.m_ctrlError, 4);
|
||||
this.m_ctrlError.Name = "m_ctrlError";
|
||||
//
|
||||
// tableLayoutPanel3
|
||||
// bootModesControl1
|
||||
//
|
||||
resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
|
||||
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
|
||||
this.bootModesControl1.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.bootModesControl1, 4);
|
||||
resources.ApplyResources(this.bootModesControl1, "bootModesControl1");
|
||||
this.bootModesControl1.Name = "bootModesControl1";
|
||||
//
|
||||
// label2
|
||||
//
|
||||
@ -242,7 +245,6 @@
|
||||
private XenAdmin.Controls.Common.AutoHeightLabel lblIntro;
|
||||
private System.Windows.Forms.Label lblCPUs;
|
||||
private System.Windows.Forms.Label lblMemory;
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Label label3;
|
||||
@ -255,5 +257,6 @@
|
||||
private XenAdmin.Controls.Common.PasswordFailure m_ctrlError;
|
||||
private System.Windows.Forms.GroupBox m_groupBoxAddSpace;
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
|
||||
private BootModesControl bootModesControl1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -81,6 +81,7 @@ namespace XenAdmin.Wizards.ImportWizard
|
||||
m_upDownMemory.Value = m_upDownMemory.Minimum;
|
||||
m_upDownCpuCount.Value = m_upDownCpuCount.Minimum;
|
||||
m_upDownAddSpace.Value = m_upDownAddSpace.Minimum;
|
||||
bootModesControl1.CheckBIOSBootMode();
|
||||
}
|
||||
|
||||
public override void SelectDefaultControl()
|
||||
@ -107,6 +108,8 @@ namespace XenAdmin.Wizards.ImportWizard
|
||||
|
||||
public ulong AdditionalSpace { get { return m_groupBoxAddSpace.Enabled ? (ulong)m_upDownAddSpace.Value * GB : 0; } }
|
||||
|
||||
public Actions.VMActions.BootMode SelectedBootMode { get { return bootModesControl1.SelectedOption; } }
|
||||
|
||||
#endregion
|
||||
|
||||
#region Private Methods
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblIntro.Text" xml:space="preserve">
|
||||
<value>この新規仮想マシンを識別するための名前を入力して、割り当てる仮想 CPU の数とメモリの量を指定します。</value>
|
||||
<value>この新規仮想マシンを識別するための名前を入力して、割り当てる仮想 CPU の数とメモリの量を指定します、新しい仮想マシンに適用されるブートモードを選択します。</value>
|
||||
</data>
|
||||
<data name=">>lblIntro.Name" xml:space="preserve">
|
||||
<value>lblIntro</value>
|
||||
@ -370,7 +370,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 14</value>
|
||||
<value>13, 11</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>69, 17</value>
|
||||
@ -394,7 +394,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>88, 13</value>
|
||||
<value>106, 8</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>59, 19</value>
|
||||
@ -424,7 +424,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>153, 14</value>
|
||||
<value>171, 11</value>
|
||||
</data>
|
||||
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>21, 17</value>
|
||||
@ -457,7 +457,7 @@
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>566, 45</value>
|
||||
<value>566, 36</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -475,19 +475,19 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,Absolute,20" /><Rows Styles="Absolute,10,AutoSize,0,Absolute,10" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10" /><Rows Styles="Absolute,5,AutoSize,0,Absolute,5" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 124</value>
|
||||
<value>3, 237</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>572, 63</value>
|
||||
<value>572, 55</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Text" xml:space="preserve">
|
||||
<value>WIM ファイルの追加容量</value>
|
||||
@ -517,7 +517,7 @@
|
||||
<value/>
|
||||
</data>
|
||||
<data name="m_ctrlError.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 200</value>
|
||||
<value>0, 305</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
@ -526,7 +526,7 @@
|
||||
<value>578, 1</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name=">>m_ctrlError.Name" xml:space="preserve">
|
||||
<value>m_ctrlError</value>
|
||||
@ -540,6 +540,39 @@
|
||||
<data name=">>m_ctrlError.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 129</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 5, 0, 0</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>150, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 3, 3, 3</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>578, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Name" xml:space="preserve">
|
||||
<value>bootModesControl1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -568,34 +601,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>200, 100</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Name" xml:space="preserve">
|
||||
<value>tableLayoutPanel3</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,30.54263,Percent,69.45737" /><Rows Styles="Absolute,20" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="bootModesControl1" Row="5" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
@ -634,6 +640,6 @@
|
||||
<value>ImageVMConfigPage</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.GenericPages.ImExPortPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -139,7 +139,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblIntro.Text" xml:space="preserve">
|
||||
<value>Enter a name that will help you identify the virtual machine later and specify the number of virtual CPUs and the amount of memory that will be initially allocated to the new virtual machine.</value>
|
||||
<value>Enter a name that will help you identify the virtual machine later, specify the number of virtual CPUs and the amount of memory that will be initially allocated to the new VM and select the boot mode that will be applied to the new VM.</value>
|
||||
</data>
|
||||
<data name=">>lblIntro.Name" xml:space="preserve">
|
||||
<value>lblIntro</value>
|
||||
@ -370,7 +370,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 16</value>
|
||||
<value>13, 11</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>87, 13</value>
|
||||
@ -394,7 +394,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>106, 13</value>
|
||||
<value>106, 8</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>59, 20</value>
|
||||
@ -424,7 +424,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>171, 16</value>
|
||||
<value>171, 11</value>
|
||||
</data>
|
||||
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>22, 13</value>
|
||||
@ -457,7 +457,7 @@
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>566, 46</value>
|
||||
<value>566, 36</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -475,19 +475,19 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,Absolute,20" /><Rows Styles="Absolute,10,AutoSize,0,Absolute,10" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10" /><Rows Styles="Absolute,5,AutoSize,0,Absolute,5" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 147</value>
|
||||
<value>3, 237</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>572, 65</value>
|
||||
<value>572, 55</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Text" xml:space="preserve">
|
||||
<value>Additional space for .wim files</value>
|
||||
@ -517,7 +517,7 @@
|
||||
<value />
|
||||
</data>
|
||||
<data name="m_ctrlError.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 225</value>
|
||||
<value>0, 305</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
@ -526,7 +526,7 @@
|
||||
<value>578, 22</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name=">>m_ctrlError.Name" xml:space="preserve">
|
||||
<value>m_ctrlError</value>
|
||||
@ -540,6 +540,39 @@
|
||||
<data name=">>m_ctrlError.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 129</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 5, 0, 0</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>150, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 3, 3, 3</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>578, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Name" xml:space="preserve">
|
||||
<value>bootModesControl1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -568,34 +601,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>200, 100</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Name" xml:space="preserve">
|
||||
<value>tableLayoutPanel3</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,30.54263,Percent,69.45737" /><Rows Styles="Absolute,20" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="bootModesControl1" Row="5" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
@ -634,6 +640,6 @@
|
||||
<value>ImageVMConfigPage</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.GenericPages.ImExPortPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -139,7 +139,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblIntro.Text" xml:space="preserve">
|
||||
<value>输入有助于以后识别虚拟机的名称，并指定最初分配给新虚拟机的虚拟 CPU 数和内存量。</value>
|
||||
<value>输入有助于以后识别虚拟机的名称，指定最初分配给新虚拟机的虚拟 CPU 数和内存量，并选择将应用于新虚拟机的引导模式。</value>
|
||||
</data>
|
||||
<data name=">>lblIntro.Name" xml:space="preserve">
|
||||
<value>lblIntro</value>
|
||||
@ -370,7 +370,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 16</value>
|
||||
<value>13, 11</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>87, 13</value>
|
||||
@ -394,7 +394,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>106, 13</value>
|
||||
<value>106, 8</value>
|
||||
</data>
|
||||
<data name="m_upDownAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>59, 20</value>
|
||||
@ -424,7 +424,7 @@
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>171, 16</value>
|
||||
<value>171, 11</value>
|
||||
</data>
|
||||
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>22, 13</value>
|
||||
@ -457,7 +457,7 @@
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>566, 46</value>
|
||||
<value>566, 36</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -475,19 +475,19 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,Absolute,20" /><Rows Styles="Absolute,10,AutoSize,0,Absolute,10" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="m_upDownAddSpace" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10" /><Rows Styles="Absolute,5,AutoSize,0,Absolute,5" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 147</value>
|
||||
<value>3, 237</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>572, 65</value>
|
||||
<value>572, 55</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="m_groupBoxAddSpace.Text" xml:space="preserve">
|
||||
<value>.wim 文件占用的额外空间</value>
|
||||
@ -517,7 +517,7 @@
|
||||
<value/>
|
||||
</data>
|
||||
<data name="m_ctrlError.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 225</value>
|
||||
<value>0, 305</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
@ -526,7 +526,7 @@
|
||||
<value>578, 22</value>
|
||||
</data>
|
||||
<data name="m_ctrlError.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name=">>m_ctrlError.Name" xml:space="preserve">
|
||||
<value>m_ctrlError</value>
|
||||
@ -540,6 +540,39 @@
|
||||
<data name=">>m_ctrlError.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 129</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 5, 0, 0</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>150, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 3, 3, 3</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>578, 105</value>
|
||||
</data>
|
||||
<data name="bootModesControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Name" xml:space="preserve">
|
||||
<value>bootModesControl1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>bootModesControl1.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -568,34 +601,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>200, 100</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Name" xml:space="preserve">
|
||||
<value>tableLayoutPanel3</value>
|
||||
</data>
|
||||
<data name=">>tableLayoutPanel3.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,30.54263,Percent,69.45737" /><Rows Styles="Absolute,20" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_textBoxVMName" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="lblCPUs" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownCpuCount" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lblMemory" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_upDownMemory" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_groupBoxAddSpace" Row="6" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="m_ctrlError" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="bootModesControl1" Row="5" RowSpan="1" Column="0" ColumnSpan="4" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,AutoSize,0,Absolute,20" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
@ -634,6 +640,6 @@
|
||||
<value>ImageVMConfigPage</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Wizards.GenericPages.ImExPortPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -42,7 +42,7 @@ using XenAdmin.Network;
|
||||
using XenAdmin.Wizards.GenericPages;
|
||||
using XenAPI;
|
||||
using System.Linq;
|
||||
|
||||
using XenAdmin.Actions.VMActions;
|
||||
using XenOvf;
|
||||
using XenOvf.Definitions;
|
||||
using XenOvf.Utilities;
|
||||
@ -521,6 +521,7 @@ namespace XenAdmin.Wizards.ImportWizard
|
||||
temp.Add(new Tuple(Messages.FINISH_PAGE_VMNAME, m_pageVMconfig.VmName));
|
||||
temp.Add(new Tuple(Messages.FINISH_PAGE_CPUCOUNT, m_pageVMconfig.CpuCount.ToString()));
|
||||
temp.Add(new Tuple(Messages.FINISH_PAGE_MEMORY, string.Format(Messages.VAL_MB, m_pageVMconfig.Memory)));
|
||||
temp.Add(new Tuple(Messages.BOOT_MODE, m_pageVMconfig.SelectedBootMode.StringOf()));
|
||||
|
||||
if (m_pageImportSource.IsWIM)
|
||||
temp.Add(new Tuple(Messages.FINISH_PAGE_ADDSPACE, Util.DiskSizeString(m_pageVMconfig.AdditionalSpace)));
|
||||
@ -675,7 +676,7 @@ namespace XenAdmin.Wizards.ImportWizard
|
||||
return Guid.NewGuid().ToString();
|
||||
}
|
||||
|
||||
private EnvelopeType InitialiseOvfEnvelope()
|
||||
private EnvelopeType InitialiseOvfEnvelope()
|
||||
{
|
||||
EnvelopeType env = OVF.CreateEnvelope(m_pageVMconfig.VmName);
|
||||
|
||||
@ -685,6 +686,12 @@ namespace XenAdmin.Wizards.ImportWizard
|
||||
OVF.AddVirtualSystemSettingData(env, systemID, hdwareSectionId, env.Name, Messages.VIRTUAL_MACHINE,
|
||||
Messages.OVF_CREATED, guid, "hvm-3.0-unknown");
|
||||
|
||||
var bootMode = m_pageVMconfig.SelectedBootMode;
|
||||
if (bootMode == BootMode.UEFI_BOOT || bootMode == BootMode.UEFI_SECURE_BOOT )
|
||||
OVF.AddOtherSystemSettingData(env, systemID, "HVM_boot_params", "firmware=uefi", OVF.GetContentMessage("OTHER_SYSTEM_SETTING_DESCRIPTION_6"));
|
||||
if (bootMode == BootMode.UEFI_SECURE_BOOT)
|
||||
OVF.AddOtherSystemSettingData(env, systemID, "platform", "secureboot=true", OVF.GetContentMessage("OTHER_SYSTEM_SETTING_DESCRIPTION_3"));
|
||||
|
||||
OVF.SetCPUs(env, systemID, m_pageVMconfig.CpuCount);
|
||||
OVF.SetMemory(env, systemID, m_pageVMconfig.Memory, "MB");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user