From 079faacd092b30894d2fc102133e6320b2f19554 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 17 Jan 2011 17:08:07 -0800 Subject: [PATCH] bug 8032: XenServer doesn't have Ubuntu 10.04 template, it will consider it as other media, it is HVM VM after installing from CD, user needs to change the OS type to CentOS 5.3 (32 bit)/CentOS 5.3 (64 bit) if user want to run it as PV kernel status 8032: resolved fixed --- .../com/cloud/hypervisor/xen/resource/CitrixHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index 4071d52dd4a..3b94fb42cf2 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -157,8 +157,8 @@ public class CitrixHelper { _xenServerGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2 (32-bit)"); _xenServerGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)"); _xenServerGuestOsMap.put("Other install media", "Other install media"); - _xenServerGuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5 (32-bit)"); - _xenServerGuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5 (64-bit)"); +// _xenServerGuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5.3 (32-bit"); +// _xenServerGuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5.3 (64-bit"); } static { @@ -232,8 +232,8 @@ public class CitrixHelper { _xenServer56FP1GuestOsMap.put("Ubuntu Lucid Lynx 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit) (experimental)"); _xenServer56FP1GuestOsMap.put("Ubuntu Lucid Lynx 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit) (experimental)"); _xenServer56FP1GuestOsMap.put("Other install media", "Other install media"); - _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5.3 (32-bit"); - _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5.3 (64-bit"); +// _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5 (32-bit)"); +// _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (64-bit)", "CentOS 5 (64-bit)"); } public static String getXcpGuestOsType(String stdType) {