You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/02/21 19:23:38 UTC
git commit: refs/heads/vim51_win8 - Fix systemvm.iso path search
issue.
Updated Branches:
refs/heads/vim51_win8 0f3a3a9a6 -> c9f0af42a
Fix systemvm.iso path search issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c9f0af42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c9f0af42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c9f0af42
Branch: refs/heads/vim51_win8
Commit: c9f0af42a6206ddf21f760469e21ab6dac5feddd
Parents: 0f3a3a9
Author: Min Chen <mi...@citrix.com>
Authored: Thu Feb 21 10:22:14 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Feb 21 10:22:14 2013 -0800
----------------------------------------------------------------------
.../vmware/manager/VmwareManagerImpl.java | 26 +++++++++-----
1 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c9f0af42/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 21cd914..64dbea1 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
@@ -584,10 +584,15 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
private File getSystemVMPatchIsoFile() {
// locate systemvm.iso
- URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
- File file = new File(url.getFile());
- File isoFile = new File(file.getParent() + "/vms/systemvm.iso");
- if (!isoFile.exists()) {
+ //URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
+ //File file = new File(url.getFile());
+ //File isoFile = new File(file.getParent() + "/vms/systemvm.iso");
+ URL url = this.getClass().getClassLoader().getResource("vms/systemvm.iso");
+ File isoFile = null;
+ if (url != null) {
+ isoFile = new File(url.getPath());
+ }
+ if (isoFile == null || !isoFile.exists()) {
isoFile = new File("/usr/lib64/cloud/common/" + "/vms/systemvm.iso");
if (!isoFile.exists()) {
isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso");
@@ -598,11 +603,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
@Override
public File getSystemVMKeyFile() {
- URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
- File file = new File(url.getFile());
-
- File keyFile = new File(file.getParent(), "/scripts/vm/systemvm/id_rsa.cloud");
- if (!keyFile.exists()) {
+ // URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
+ // File file = new File(url.getFile());
+ URL url = this.getClass().getClassLoader().getResource("scripts/vm/systemvm/id_rsa.cloud");
+ File keyFile = null;
+ if ( url != null ){
+ keyFile = new File(url.getPath());
+ }
+ if (keyFile == null || !keyFile.exists()) {
keyFile = new File("/usr/lib64/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");
if (!keyFile.exists()) {
keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");