From 4f764e63350ded767f382cf65ad716a866fdef99 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 25 Sep 2012 15:49:16 -0700 Subject: [PATCH] fix can't find system vm template on latest ubuntu 12.04, for devcloud --- .../com/cloud/hypervisor/xen/resource/XcpOssResource.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java index d4260c72930..0a1064707b1 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java @@ -74,7 +74,11 @@ public class XcpOssResource extends CitrixResourceBase { @Override protected String getGuestOsType(String stdType, boolean bootFromCD) { - return CitrixHelper.getXcpGuestOsType(stdType); + if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) { + return "Debian Squeeze 6.0 (64-bit)"; + } else { + return CitrixHelper.getXcpGuestOsType(stdType); + } } protected VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException {