You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/01/16 07:03:28 UTC
[2/2] git commit: updated refs/heads/master to 5028874
under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py
Signed-off-by: Rajani Karuturi <ra...@gmail.com>
This closes #66
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c30636c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c30636c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c30636c
Branch: refs/heads/master
Commit: 4c30636c226f9ca92be8bfeffdbf2b8c98930ed5
Parents: dc72e9f
Author: cloudtrends <23...@qq.com>
Authored: Wed Jan 14 19:51:18 2015 +0800
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Fri Jan 16 11:33:00 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/ConfigurationServerImpl.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c30636c/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 306c0e7..dec2e7c 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -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);