From 317f66758d7c1d046ea4e4f3af0f9e31be2a56ec Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Mon, 31 Aug 2020 22:44:56 +0100 Subject: [PATCH] Removed Settings file. It is not meant for storing constants and most entries were obsolete anyway. Signed-off-by: Konstantina Chremmou --- XenModel/BrandManager.cs | 1 + XenOvfTransport/Import.cs | 45 +-- .../Properties/Settings.Designer.cs | 332 ------------------ XenOvfTransport/Properties/Settings.settings | 120 ------- XenOvfTransport/XenOvfTransport.csproj | 12 - XenOvfTransport/app.config | 157 --------- scripts/re-branding.sh | 1 - 7 files changed, 19 insertions(+), 649 deletions(-) delete mode 100644 XenOvfTransport/Properties/Settings.Designer.cs delete mode 100644 XenOvfTransport/Properties/Settings.settings delete mode 100644 XenOvfTransport/app.config diff --git a/XenModel/BrandManager.cs b/XenModel/BrandManager.cs index c5528d2a8..319c9f013 100644 --- a/XenModel/BrandManager.cs +++ b/XenModel/BrandManager.cs @@ -73,6 +73,7 @@ namespace XenAdmin.Core public const string XENCENTER_VERSION = "[BRANDING_PRODUCT_VERSION]"; public const string COMPANY_NAME_LEGAL = "[BRANDING_COMPANY_NAME_LEGAL]"; public const string BRAND_CONSOLE = "[XenCenter]"; + public const string VM_TOOLS = "[Citrix VM Tools]"; /// /// Returns null if no match is found. diff --git a/XenOvfTransport/Import.cs b/XenOvfTransport/Import.cs index d5abb234f..979c078a0 100644 --- a/XenOvfTransport/Import.cs +++ b/XenOvfTransport/Import.cs @@ -287,7 +287,7 @@ namespace XenOvfTransport VM.hard_shutdown(xenSession, vm); while (VM.get_power_state(xenSession, vm) != vm_power_state.Halted) - Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs); + Thread.Sleep(1000); // Save its original memory configuration. long staticMemoryMin = VM.get_memory_static_min(xenSession, vm); @@ -296,12 +296,12 @@ namespace XenOvfTransport long dynamicMemoryMax = VM.get_memory_dynamic_max(xenSession, vm); // Minimize the memory capacity for the fixup OS. - long fixupMemorySize = Properties.Settings.Default.FixupOsMemorySizeAsMB * Util.BINARY_MEGA; + long fixupMemorySize = 256 * Util.BINARY_MEGA; VM.set_memory_limits(xenSession, vm, fixupMemorySize, fixupMemorySize, fixupMemorySize, fixupMemorySize); // Run the fixup OS on the VM. - InstallSectionStartVirtualMachine(xenSession, vm, Properties.Settings.Default.FixupDurationAsSeconds); + InstallSectionStartVirtualMachine(xenSession, vm, 600); // Restore the original memory configuration. VM.set_memory_limits(xenSession, vm, staticMemoryMin, staticMemoryMax, dynamicMemoryMin, dynamicMemoryMax); @@ -336,7 +336,7 @@ namespace XenOvfTransport // Wait for it to start. while (VM.get_power_state(xenSession, vm) != vm_power_state.Running) - Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs); + Thread.Sleep(1000); // Let it run for the requested duration. int bootStopDelayAsMs = initialBootStopDelayAsSeconds * 1000; @@ -344,8 +344,8 @@ namespace XenOvfTransport while (VM.get_power_state(xenSession, vm) == vm_power_state.Running) { - Thread.Sleep(Properties.Settings.Default.FixupPollTimeAsMs); - msRunning += Properties.Settings.Default.FixupPollTimeAsMs; + Thread.Sleep(1000); + msRunning += 1000; if (msRunning > bootStopDelayAsMs) break; @@ -698,9 +698,10 @@ namespace XenOvfTransport if (system.VirtualSystemOtherConfigurationData == null || system.VirtualSystemOtherConfigurationData.Length <= 0) { // DEFAULT should work for all of HVM type or 301 - newVm.HVM_boot_policy = Properties.Settings.Default.xenBootOptions; - newVm.HVM_boot_params = SplitStringIntoDictionary(Properties.Settings.Default.xenBootParams); - newVm.platform = MakePlatformHash(Properties.Settings.Default.xenPlatformSetting); + newVm.HVM_boot_policy = "BIOS order"; + newVm.HVM_boot_params = new Dictionary {{"order", "dc"}}; + newVm.platform = new Dictionary + {{"nx", "true"}, {"acpi", "true"}, {"apic", "true"}, {"pae", "true"}, {"stdvga", "0"}}; } else { @@ -719,7 +720,9 @@ namespace XenOvfTransport : new Dictionary {{"order", xcsdValue}}; break; case "platform": - newVm.platform = MakePlatformHash(xcsd.Value.Value); + newVm.platform = SplitStringIntoDictionary(xcsd.Value.Value); + if (!newVm.platform.ContainsKey("nx")) + newVm.platform.Add("nx", "true"); break; case "nvram": newVm.NVRAM = SplitStringIntoDictionary(xcsd.Value.Value); @@ -872,17 +875,6 @@ namespace XenOvfTransport .ToDictionary(o => o.FirstOrDefault(), o => o.LastOrDefault()); } - private static Dictionary MakePlatformHash(string platform) - { - var hPlatform = SplitStringIntoDictionary(platform); - - // Handle the case when NX isn't in the platform string. - if (!hPlatform.ContainsKey("nx")) - hPlatform.Add("nx", "true"); - - return hPlatform; - } - private static void AddResourceSettingData(Session xenSession, Action OnUpdate, XenRef vmRef, RASD_Type rasd, string pathToOvf, string filename, string compression, string version, string passcode, bool metaDataOnly, string encryptionClass, ref int vifDeviceIndex) { switch (rasd.ResourceType.Value) @@ -925,14 +917,13 @@ namespace XenOvfTransport // During Network Selection the UUID for Network was set in Connection Field // Makes data self contained here. - if (rasd.Connection[0].Value.Contains(Properties.Settings.Default.xenNetworkKey) || - rasd.Connection[0].Value.Contains(Properties.Settings.Default.xenNetworkUuidKey)) + if (rasd.Connection[0].Value.Contains("network=") || + rasd.Connection[0].Value.Contains("XenNetwork=")) { string[] s = rasd.Connection[0].Value.Split(','); for (int i = 0; i < s.Length; i++) { - if (s[i].StartsWith(Properties.Settings.Default.xenNetworkKey) || - s[i].StartsWith(Properties.Settings.Default.xenNetworkUuidKey)) + if (s[i].StartsWith("network=") || s[i].StartsWith("XenNetwork=")) { string[] s1 = s[i].Split('='); netuuid = s1[1]; @@ -960,7 +951,7 @@ namespace XenOvfTransport net = netRef; } // ok find the default. - if (networks[netRef].bridge.ToLower().Contains(Properties.Settings.Default.xenDefaultNetwork)) + if (networks[netRef].bridge.ToLower().Contains("xenbr0")) { netDefault = netRef; } @@ -1112,7 +1103,7 @@ namespace XenOvfTransport { if (srDictionary[key].content_type.ToLower() == "iso" && srDictionary[key].type.ToLower() == "iso") { - if (srDictionary[key].name_label.ToLower().Equals(Properties.Settings.Default.xenTools.ToLower())) + if (srDictionary[key].name_label.ToLower().Equals(BrandManager.VM_TOOLS)) { isoUuid = srDictionary[key].uuid; break; diff --git a/XenOvfTransport/Properties/Settings.Designer.cs b/XenOvfTransport/Properties/Settings.Designer.cs deleted file mode 100644 index ae66ff911..000000000 --- a/XenOvfTransport/Properties/Settings.Designer.cs +++ /dev/null @@ -1,332 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace XenOvfTransport.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("P2V Automatically created.")] - public string xenP2VDiskName { - get { - return ((string)(this["xenP2VDiskName"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("BIOS order")] - public string xenBootOptions { - get { - return ((string)(this["xenBootOptions"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("order=dc;")] - public string xenBootParams { - get { - return ((string)(this["xenBootParams"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("nx=true;acpi=true;apic=true;pae=true;stdvga=0;")] - public string xenPlatformSetting { - get { - return ((string)(this["xenPlatformSetting"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("network=")] - public string xenNetworkKey { - get { - return ((string)(this["xenNetworkKey"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("xenbr0")] - public string xenDefaultNetwork { - get { - return ((string)(this["xenDefaultNetwork"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("/var/run/sr-mount/{0}")] - public string xenISOMount { - get { - return ((string)(this["xenISOMount"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("/var/opt/xen/iso_import")] - public string xenISOTools { - get { - return ((string)(this["xenISOTools"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("xenserver-linuxfixup-disk.iso")] - public string XenFixupLabel { - get { - return ((string)(this["XenFixupLabel"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("sr=")] - public string xenSRKey { - get { - return ((string)(this["xenSRKey"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("device=")] - public string xenDeviceKey { - get { - return ((string)(this["xenDeviceKey"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("XenNetwork=")] - public string xenNetworkUuidKey { - get { - return ((string)(this["xenNetworkUuidKey"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1.0.0")] - public string OVFVersion { - get { - return ((string)(this["OVFVersion"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("^(http|https|file|ftp)://*")] - public string uriRegex { - get { - return ((string)(this["uriRegex"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("DoNotUse_iSCSI_target")] - public string iSCSITargetName { - get { - return ((string)(this["iSCSITargetName"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute(@" - - Pool-wide network associated with eth0 - Network 0 -")] - public global::System.Collections.Specialized.StringCollection iSCSINetworkName { - get { - return ((global::System.Collections.Specialized.StringCollection)(this["iSCSINetworkName"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("5")] - public int iSCSIConnectRetry { - get { - return ((int)(this["iSCSIConnectRetry"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Transfer VM for VDI {0}")] - public string iSCSITransferVM { - get { - return ((string)(this["iSCSITransferVM"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1.5,1.6,LATEST")] - public string xenSupportedVersions { - get { - return ((string)(this["xenSupportedVersions"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute(@" - - network_config=auto #REQUIRED: MUST BE FIRST Values: ""auto"" ""manual"" - network_mode=dhcp #REQUIRED: MUST BE SECOND Values: ""dhcp"" ""manual"" - network_port=3260 #OPTIONAL: port for config is manual - network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual - network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual - network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual - network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual -")] - public global::System.Collections.Specialized.StringCollection iSCSITransferVMNetwork { - get { - return ((global::System.Collections.Specialized.StringCollection)(this["iSCSITransferVMNetwork"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("en-us")] - public string DEFAULT_CULTURE { - get { - return ((string)(this["DEFAULT_CULTURE"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute(@" - - \PAGEFILE.SYS - \HIBERFIL.SYS - \SYSTEM VOLUME INFORMATION -")] - public global::System.Collections.Specialized.StringCollection EXCLUDED_FILES_COPY { - get { - return ((global::System.Collections.Specialized.StringCollection)(this["EXCLUDED_FILES_COPY"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute(".bz2")] - public string bzip2ext { - get { - return ((string)(this["bzip2ext"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("management #Replace with Network UUID to change iSCSI network utilization.")] - public string iSCSITransferVMMgtNetwork { - get { - return ((string)(this["iSCSITransferVMMgtNetwork"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool CreateApplianceFolder { - get { - return ((bool)(this["CreateApplianceFolder"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ApplianceFolderPath { - get { - return ((string)(this["ApplianceFolderPath"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("256")] - public long FixupOsMemorySizeAsMB { - get { - return ((long)(this["FixupOsMemorySizeAsMB"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("600")] - public int FixupDurationAsSeconds { - get { - return ((int)(this["FixupDurationAsSeconds"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1000")] - public int FixupPollTimeAsMs { - get { - return ((int)(this["FixupPollTimeAsMs"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("[XenServer product] P2V (Orela) Server")] - public string p2vTemplate { - get { - return ((string)(this["p2vTemplate"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("[Citrix VM Tools]")] - public string xenTools { - get { - return ((string)(this["xenTools"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("[XenServer product] Transfer")] - public string iSCSITransferVMName { - get { - return ((string)(this["iSCSITransferVMName"])); - } - } - } -} diff --git a/XenOvfTransport/Properties/Settings.settings b/XenOvfTransport/Properties/Settings.settings deleted file mode 100644 index e2a024bc6..000000000 --- a/XenOvfTransport/Properties/Settings.settings +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - P2V Automatically created. - - - BIOS order - - - order=dc; - - - nx=true;acpi=true;apic=true;pae=true;stdvga=0; - - - network= - - - xenbr0 - - - /var/run/sr-mount/{0} - - - /var/opt/xen/iso_import - - - xenserver-linuxfixup-disk.iso - - - sr= - - - device= - - - XenNetwork= - - - 1.0.0 - - - ^(http|https|file|ftp)://* - - - DoNotUse_iSCSI_target - - - <?xml version="1.0" encoding="utf-16"?> -<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <string>Pool-wide network associated with eth0</string> - <string>Network 0</string> -</ArrayOfString> - - - 5 - - - Transfer VM for VDI {0} - - - 1.5,1.6,LATEST - - - <?xml version="1.0" encoding="utf-16"?> -<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <string>network_config=auto #REQUIRED: MUST BE FIRST Values: "auto" "manual"</string> - <string>network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual"</string> - <string>network_port=3260 #OPTIONAL: port for config is manual</string> - <string>network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual</string> - <string>network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual</string> - <string>network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual</string> - <string>network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual</string> -</ArrayOfString> - - - en-us - - - <?xml version="1.0" encoding="utf-16"?> -<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <string>\PAGEFILE.SYS</string> - <string>\HIBERFIL.SYS</string> - <string>\SYSTEM VOLUME INFORMATION</string> -</ArrayOfString> - - - .bz2 - - - management #Replace with Network UUID to change iSCSI network utilization. - - - True - - - - - - 256 - - - 600 - - - 1000 - - - [XenServer product] P2V (Orela) Server - - - [Citrix VM Tools] - - - [XenServer product] Transfer - - - \ No newline at end of file diff --git a/XenOvfTransport/XenOvfTransport.csproj b/XenOvfTransport/XenOvfTransport.csproj index 1df18074c..e9ee524d4 100644 --- a/XenOvfTransport/XenOvfTransport.csproj +++ b/XenOvfTransport/XenOvfTransport.csproj @@ -58,11 +58,6 @@ Messages.resx - - True - True - Settings.settings - @@ -82,13 +77,6 @@ XenOvfApi - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - ResXFileCodeGenerator diff --git a/XenOvfTransport/app.config b/XenOvfTransport/app.config deleted file mode 100644 index 4cf62a9bd..000000000 --- a/XenOvfTransport/app.config +++ /dev/null @@ -1,157 +0,0 @@ - - - - -
-
- - - - - - P2V Automatically created. - - - BIOS order - - - order=dc; - - - nx=true;acpi=true;apic=true;pae=true;stdvga=0; - - - network= - - - xenbr0 - - - /var/run/sr-mount/{0} - - - /var/opt/xen/iso_import - - - xenserver-linuxfixup-disk.iso - - - sr= - - - device= - - - XenNetwork= - - - 1.0.0 - - - ^(http|https|file|ftp)://* - - - DoNotUse_iSCSI_target - - - - - Pool-wide network associated with eth0 - Network 0 - - - - - 5 - - - Transfer VM for VDI {0} - - - 1.5,1.6,LATEST - - - - - network_config=auto #REQUIRED: MUST BE FIRST Values: "auto" "manual" - network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual" - network_port=3260 #OPTIONAL: port for config is manual - network_mac=00:00:00:00:00:00 #OPTIONAL: set mac address for config is manual - network_ip=192.168.2.69 #OPTIONAL: Required if mode is manual - network_mask=255.255.255.0 #OPTIONAL: Required if mode is manual - network_gateway=192.168.2.1 #OPTIONAL: Required if mode is manual - - - - - en-us - - - - - \PAGEFILE.SYS - \HIBERFIL.SYS - \SYSTEM VOLUME INFORMATION - - - - - .bz2 - - - management #Replace with Network UUID to change iSCSI network utilization. - - - True - - - - - - 256 - - - 600 - - - 1000 - - - [XenServer product] P2V (Orela) Server - - - [Citrix VM Tools] - - - [XenServer product] Transfer - - - - - [XenServer product] P2V (Orela) Server - - - P2V Automatically created. - - - BIOS order - - - order=dc; - - - acpi=true;apic=true;pae=true;stdvga=0; - - - XenNetwork= - - - xenbr0 - - - - - diff --git a/scripts/re-branding.sh b/scripts/re-branding.sh index fd1750fcd..6166c0b2e 100644 --- a/scripts/re-branding.sh +++ b/scripts/re-branding.sh @@ -106,7 +106,6 @@ rebranding_global ${REPO}/XenOvfApi/app.config #XenOvfTransport XenOvfTransport RESX_rebranding ${REPO}/XenOvfTransport/Messages -rebranding_global ${REPO}/XenOvfTransport/app.config PRODUCT_GUID=$(uuidgen | tr [a-z] [A-Z] | tr -d [:space:])