incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: fix can't find system vm template on latest ubuntu 12.04, for devcloud
Date Tue, 25 Sep 2012 22:50:53 GMT
Updated Branches:
  refs/heads/4.0 ff738feac -> 4f764e633


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/4f764e63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4f764e63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4f764e63

Branch: refs/heads/4.0
Commit: 4f764e63350ded767f382cf65ad716a866fdef99
Parents: ff738fe
Author: Edison Su <sudison@gmail.com>
Authored: Tue Sep 25 15:49:16 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Sep 25 15:50:44 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/4f764e63/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 {


Mime
View raw message