You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/02/14 17:45:04 UTC
git commit: refs/heads/master - Summary: Adjust systemvm.iso path for
KVM, due to packaging changes
Updated Branches:
refs/heads/master 4364cb978 -> 298c5ee06
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 <ma...@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/298c5ee0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/298c5ee0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/298c5ee0
Branch: refs/heads/master
Commit: 298c5ee06b0774d0f4cf059dd21a249777b45251
Parents: 4364cb9
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu Feb 14 09:44:03 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu Feb 14 09:45:57 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/298c5ee0/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 5d17fd0..9472ea2 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
@@ -698,10 +698,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;