Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1807 from MihaelaStoica/CA-266814

Browse Source 
CA-266814: Fix the precheck that requires shared CDs to be ejected pr…
This commit is contained in:
Gabor Apati-Nagy 2017-10-10 14:09:03 +01:00 committed by GitHub
commit 4a574a8728
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Diagnostics/Checks/AssertCanEvacuateCheck.cs
View File

@ -90,7 +90,7 @@ namespace XenAdmin.Diagnostics.Checks
problems.Add(new ToolsCD(this, residentVM)); problems.Add(new ToolsCD(this, residentVM));
VMsWithProblems.Add(residentVM.opaque_ref); VMsWithProblems.Add(residentVM.opaque_ref);
} }
else if (sr != null && sr.content_type == SR.Content_Type_ISO) else if (sr != null && sr.content_type == SR.Content_Type_ISO && (!sr.shared || Properties.Settings.Default.EjectSharedIsoOnUpdate))
{ {
problems.Add(new LocalCD(this, residentVM)); problems.Add(new LocalCD(this, residentVM));
VMsWithProblems.Add(residentVM.opaque_ref); VMsWithProblems.Add(residentVM.opaque_ref);

13
XenAdmin/Properties/Settings.Designer.cs generated
View File

@ -812,5 +812,18 @@ namespace XenAdmin.Properties {
this["HelpLastUsed"] = value; this["HelpLastUsed"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
public bool EjectSharedIsoOnUpdate {
get {
return ((bool)(this["EjectSharedIsoOnUpdate"]));
}
set {
this["EjectSharedIsoOnUpdate"] = value;
}
}
} }
} }

3
XenAdmin/Properties/Settings.settings
View File

@ -188,5 +188,8 @@
<Setting Name="HelpLastUsed" Roaming="true" Type="System.String" Scope="User"> <Setting Name="HelpLastUsed" Roaming="true" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="EjectSharedIsoOnUpdate" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

3
XenAdmin/app.config
View File

@ -183,6 +183,9 @@
<setting name="HelpLastUsed" serializeAs="String"> <setting name="HelpLastUsed" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="EjectSharedIsoOnUpdate" serializeAs="String">
<value>False</value>
</setting>
</XenAdmin.Properties.Settings> </XenAdmin.Properties.Settings>
</userSettings> </userSettings>