From 5028874e1c5f1b12718d38527257edb44767ed94 Mon Sep 17 00:00:00 2001 From: cloudtrends <2306434383@qq.com> Date: Thu, 15 Jan 2015 13:53:12 +0800 Subject: [PATCH] under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py , and use isOnWindows function . thanks karuturi kindly tips. Signed-off-by: Rajani Karuturi This closes #66 --- server/src/com/cloud/server/ConfigurationServerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index dec2e7c7ce3..6081c9edd44 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -894,8 +894,7 @@ 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")) { + if (this.isOnWindows()) { scriptPath = scriptPath.replaceAll("\\\\" ,"/" ); systemVmIsoPath = systemVmIsoPath.replaceAll("\\\\" ,"/" ); publicKeyPath = publicKeyPath.replaceAll("\\\\" ,"/" );