cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 5028874
Date Fri, 16 Jan 2015 06:03:27 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master dc72e9f11 -> 5028874e1


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 <rajanikaruturi@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/5028874e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5028874e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5028874e

Branch: refs/heads/master
Commit: 5028874e1c5f1b12718d38527257edb44767ed94
Parents: 4c30636
Author: cloudtrends <2306434383@qq.com>
Authored: Thu Jan 15 13:53:12 2015 +0800
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Fri Jan 16 11:33:00 2015 +0530

----------------------------------------------------------------------
 server/src/com/cloud/server/ConfigurationServerImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5028874e/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 dec2e7c..6081c9e 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("\\\\" ,"/" );


Mime
View raw message