Updated Branches: refs/heads/4.0 63e22f9dc -> 86044c948
systemvm.iso not found when KVM launches system vms Signed-off-by: Edison Su <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/86044c94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/86044c94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/86044c94 Branch: refs/heads/4.0 Commit: 86044c948435e8c5aba9a8a2e08f66a16958e6e7 Parents: 6558ed3 Author: Marcus Sorensen <[email protected]> Authored: Thu Sep 20 13:54:41 2012 -0700 Committer: Edison Su <[email protected]> Committed: Thu Sep 20 14:00:47 2012 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86044c94/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 65742d8..aadd6dd 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 @@ -681,7 +681,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements _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/lib/cloud/agent/vms/systemvm.iso", + "/usr/lib64/cloud/common/vms/systemvm.iso", + "/usr/lib/cloud/common/vms/systemvm.iso" }; for (String isoPath : isoPaths) { if (_storage.exists(isoPath)) { _sysvmISOPath = isoPath;
