etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py 

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #66
This commit is contained in:
cloudtrends 2015-01-14 19:51:18 +08:00 committed by Rajani Karuturi
parent dc72e9f111
commit 4c30636c22
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -894,6 +894,13 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
} else {
command = new Script("/bin/bash", s_logger);
}
String osname = System.getProperty("os.name");
if (osname.startsWith("Windows")) {
scriptPath = scriptPath.replaceAll("\\\\" ,"/" );
systemVmIsoPath = systemVmIsoPath.replaceAll("\\\\" ,"/" );
publicKeyPath = publicKeyPath.replaceAll("\\\\" ,"/" );
privKeyPath = privKeyPath.replaceAll("\\\\" ,"/" );
}
command.add(scriptPath);
command.add(publicKeyPath);
command.add(privKeyPath);