You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/16 20:50:42 UTC
[31/50] [abbrv] git commit: updated
refs/heads/ui-mixed-zone-management to 5891f09
Fix command for executing injectkeys.sh
Signed-off-by: Hugo Trippaers <tr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/794e653c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/794e653c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/794e653c
Branch: refs/heads/ui-mixed-zone-management
Commit: 794e653c1325f6ba78b700f62e75c5a7b502c4eb
Parents: 1f76d8b
Author: Phong Nguyen <pn...@gilt.com>
Authored: Fri Apr 12 16:56:18 2013 -0400
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Mon Apr 15 20:43:02 2013 +0200
----------------------------------------------------------------------
.../com/cloud/server/ConfigurationServerImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/794e653c/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 596387f..404afec 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -729,7 +729,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
if (systemVmIsoPath == null) {
throw new CloudRuntimeException("Unable to find systemvm iso vms/systemvm.iso");
}
- final Script command = new Script("/bin/bash " + scriptPath, s_logger);
+ final Script command = new Script("/bin/bash", s_logger);
+ command.add(scriptPath);
command.add(publicKeyPath);
command.add(privKeyPath);
command.add(systemVmIsoPath);