From 08713f46b03292e8ce35c141b8bc643907e83ca9 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 31 Aug 2011 16:16:39 -0700 Subject: [PATCH] add other linux guest support --- .../cloud/hypervisor/xen/resource/CitrixHelper.java | 12 ++++++++---- 1 file changed, 8 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 6db9dab8174..3e9f52dd963 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -109,7 +109,8 @@ public class CitrixHelper { _xcpGuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)"); _xcpGuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit) (experimental)"); _xcpGuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit) (experimental)"); - _xcpGuestOsMap.put("Other install media", "Other install media"); + _xcpGuestOsMap.put("Other Linux (32-bit)", "Other install media"); + _xcpGuestOsMap.put("Other Linux (64-bit)", "Other install media"); _xcpGuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)"); _xcpGuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)"); } @@ -173,7 +174,8 @@ public class CitrixHelper { _xenServerGuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)"); _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("Other Linux (32-bit)", "Other install media"); + _xenServerGuestOsMap.put("Other Linux (64-bit)", "Other install media"); _xenServerGuestOsMap.put("Other PV (32-bit)", "CentOS 5.4 (32-bit)"); _xenServerGuestOsMap.put("Other PV (64-bit)", "CentOS 5.4 (64-bit)"); } @@ -248,7 +250,8 @@ public class CitrixHelper { _xenServer56FP1GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)"); _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit) (experimental)"); _xenServer56FP1GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit) (experimental)"); - _xenServer56FP1GuestOsMap.put("Other install media", "Other install media"); + _xenServer56FP1GuestOsMap.put("Other Linux (32-bit)", "Other install media"); + _xenServer56FP1GuestOsMap.put("Other Linux (64-bit)", "Other install media"); _xenServer56FP1GuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)"); _xenServer56FP1GuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)"); } @@ -324,7 +327,8 @@ public class CitrixHelper { _xenServer56FP2GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)"); _xenServer56FP2GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit) (experimental)"); _xenServer56FP2GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit) (experimental)"); - _xenServer56FP2GuestOsMap.put("Other install media", "Other install media"); + _xenServer56FP2GuestOsMap.put("Other Linux (32-bit)", "Other install media"); + _xenServer56FP2GuestOsMap.put("Other Linux (64-bit)", "Other install media"); _xenServer56FP2GuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)"); _xenServer56FP2GuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)"); }