apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 19:14:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix systemvm.iso path search issue.

Browse Source
This commit is contained in:
Min Chen 2013-02-21 10:22:14 -08:00
parent 0f3a3a9a6d
commit c9f0af42a6
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -584,10 +584,15 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
private File getSystemVMPatchIsoFile() { private File getSystemVMPatchIsoFile() {
// locate systemvm.iso // locate systemvm.iso
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation(); //URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
File file = new File(url.getFile()); //File file = new File(url.getFile());
File isoFile = new File(file.getParent() + "/vms/systemvm.iso"); //File isoFile = new File(file.getParent() + "/vms/systemvm.iso");
if (!isoFile.exists()) { 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"); isoFile = new File("/usr/lib64/cloud/common/" + "/vms/systemvm.iso");
if (!isoFile.exists()) { if (!isoFile.exists()) {
isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso"); isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso");
@ -598,11 +603,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
@Override @Override
public File getSystemVMKeyFile() { public File getSystemVMKeyFile() {
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation(); // URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
File file = new File(url.getFile()); // File file = new File(url.getFile());
URL url = this.getClass().getClassLoader().getResource("scripts/vm/systemvm/id_rsa.cloud");
File keyFile = new File(file.getParent(), "/scripts/vm/systemvm/id_rsa.cloud"); File keyFile = null;
if (!keyFile.exists()) { 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"); keyFile = new File("/usr/lib64/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");
if (!keyFile.exists()) { if (!keyFile.exists()) {
keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud"); keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");