You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/20 22:55:12 UTC

git commit: systemvm.iso not found when KVM launches system vms

Updated Branches:
  refs/heads/master 7bf7807f0 -> 9324e562e


systemvm.iso not found when KVM launches system vms

Signed-off-by: Edison Su <su...@gmail.com>


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

Branch: refs/heads/master
Commit: 9324e562e5db3edfb65731e51b03651f39256c37
Parents: 7bf7807
Author: Marcus Sorensen <sh...@gmail.com>
Authored: Thu Sep 20 13:54:41 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Sep 20 13:54:41 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/9324e562/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;