You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/26 00:49:27 UTC
git commit: fix can't find system vm template on latest ubuntu 12.04,
for devcloud
Updated Branches:
refs/heads/master 062e94a31 -> 7f914ace6
fix can't find system vm template on latest ubuntu 12.04, for devcloud
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7f914ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7f914ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7f914ace
Branch: refs/heads/master
Commit: 7f914ace65213cc7018861290721843012d1a97f
Parents: 062e94a
Author: Edison Su <su...@gmail.com>
Authored: Tue Sep 25 15:49:16 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Sep 25 15:49:16 2012 -0700
----------------------------------------------------------------------
.../hypervisor/xen/resource/XcpOssResource.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f914ace/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
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 d4260c7..0a10647 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 {