From 00495b13772e4121544151a1fafeb22b539eea68 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 31 Aug 2011 15:51:10 -0700 Subject: [PATCH] add more linux guest os 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 99e206289c5..f83813f2a6c 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -96,7 +96,8 @@ public class CitrixHelper { _xcpGuestOsMap.put("Windows Vista (32-bit)", "Windows Vista"); _xcpGuestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2"); _xcpGuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3"); - _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.5 (32-bit)"); _xcpGuestOsMap.put("Other PV (64-bit)", "CentOS 5.5 (64-bit)"); } @@ -160,7 +161,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)"); // _xenServerGuestOsMap.put("Ubuntu 10.04 (32-bit)", "CentOS 5.3 (32-bit"); @@ -237,7 +239,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)"); } @@ -313,7 +316,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)"); }