Updated Branches: refs/heads/4.1 0853aca36 -> 86bb0055c
Summary: Adjust systemvm.iso path for KVM, due to packaging changes Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old systemvm.iso files aren't found by accident. systemvm.iso should exist in /usr/share/cloudstack-common/vms now. Signed-off-by: Marcus Sorensen <mar...@betterservers.com> 1360860243 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/86bb0055 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/86bb0055 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/86bb0055 Branch: refs/heads/4.1 Commit: 86bb0055cd975695b3ec5518124a0482b891a73c Parents: 0853aca Author: Marcus Sorensen <mar...@betterservers.com> Authored: Thu Feb 14 09:44:03 2013 -0700 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Thu Feb 14 09:44:03 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86bb0055/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 55de11b..5b19a0d 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -701,10 +701,7 @@ ServerResource { _sysvmISOPath = (String) params.get("systemvm.iso.path"); if (_sysvmISOPath == null) { - String[] isoPaths = { "/usr/lib64/cloud/agent/vms/systemvm.iso", - "/usr/lib/cloud/agent/vms/systemvm.iso", - "/usr/lib64/cloud/common/vms/systemvm.iso", - "/usr/lib/cloud/common/vms/systemvm.iso" }; + String[] isoPaths = {"/usr/share/cloudstack-common/vms/systemvm.iso"}; for (String isoPath : isoPaths) { if (_storage.exists(isoPath)) { _sysvmISOPath = isoPath;
