From 5cb25036a3860fbc3290e91cd743b2d52e24c6ec Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 31 Jan 2011 10:12:52 -0800 Subject: [PATCH] Fix addHost for Xen after FOSS/premium merge --- .../cloud/hypervisor/xen/resource/XenServer56Resource.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index 947a1d28f44..51b33b241b3 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -111,6 +111,9 @@ public class XenServer56Resource extends CitrixResourceBase { } File file = new File(patchfilePath); files.add(file); + + // no premimum overriding anymore after FOSS/premium merge +/* patch = "premium-scripts/vm/hypervisor/xenserver/xenserver56/patch"; patchfilePath = Script.findScript("", patch); if (patchfilePath == null) { @@ -118,6 +121,7 @@ public class XenServer56Resource extends CitrixResourceBase { } file = new File(patchfilePath); files.add(file); +*/ return files; }