Updated Branches: refs/heads/4.0 fb88d2e9d -> 608c8c450
Changed the hardcoded vmware path to point to cloud/common Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/608c8c45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/608c8c45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/608c8c45 Branch: refs/heads/4.0 Commit: 608c8c450d3deb769df33ad6d43c006d0568be17 Parents: fb88d2e Author: Alex Huang <alex.hu...@citrix.com> Authored: Sat Oct 6 23:08:59 2012 -0700 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Sat Oct 6 23:08:59 2012 -0700 ---------------------------------------------------------------------- .../vmware/manager/VmwareManagerImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/608c8c45/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index ce1af26..64ded51 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -664,9 +664,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis File file = new File(url.getFile()); File isoFile = new File(file.getParent() + "/vms/systemvm.iso"); if (!isoFile.exists()) { - isoFile = new File("/usr/lib64/cloud/agent/" + "/vms/systemvm.iso"); + isoFile = new File("/usr/lib64/cloud/common/" + "/vms/systemvm.iso"); if (!isoFile.exists()) { - isoFile = new File("/usr/lib/cloud/agent/" + "/vms/systemvm.iso"); + isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso"); } } return isoFile; @@ -679,9 +679,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis File keyFile = new File(file.getParent(), "/scripts/vm/systemvm/id_rsa.cloud"); if (!keyFile.exists()) { - keyFile = new File("/usr/lib64/cloud/agent" + "/scripts/vm/systemvm/id_rsa.cloud"); + keyFile = new File("/usr/lib64/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud"); if (!keyFile.exists()) { - keyFile = new File("/usr/lib/cloud/agent" + "/scripts/vm/systemvm/id_rsa.cloud"); + keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud"); } } return keyFile;
