cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.3 to f2519cf
Date Mon, 13 Jan 2014 23:39:00 GMT
Updated Branches:
  refs/heads/4.3 8dda69952 -> f2519cf5f


fix devcloud: user template's guest os type is changed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2519cf5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2519cf5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2519cf5

Branch: refs/heads/4.3
Commit: f2519cf5fcf9aa167eb79fe2f09b70487d0ea713
Parents: 8dda699
Author: Edison Su <sudison@gmail.com>
Authored: Mon Jan 13 15:37:22 2014 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Mon Jan 13 15:37:52 2014 -0800

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/XcpOssResource.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2519cf5/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 7be21f3..fd222b7 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
@@ -73,7 +73,9 @@ public class XcpOssResource extends CitrixResourceBase {
     protected String getGuestOsType(String stdType, boolean bootFromCD) {
     	if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
     		return "Debian Squeeze 6.0 (64-bit)";
-    	} else {
+    	} else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
+            return "CentOS 5 (64-bit)";
+        } else {
     		return CitrixHelper.getXcpGuestOsType(stdType);
     	}
     }


Mime
View raw message