Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78A18F608 for ; Mon, 15 Apr 2013 21:07:28 +0000 (UTC) Received: (qmail 3702 invoked by uid 500); 15 Apr 2013 21:07:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3681 invoked by uid 500); 15 Apr 2013 21:07:28 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 3674 invoked by uid 99); 15 Apr 2013 21:07:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Apr 2013 21:07:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0C45F1B8B0; Mon, 15 Apr 2013 21:07:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Mon, 15 Apr 2013 21:07:28 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: updated refs/heads/ui-vm-affinity to 1069610 Updated Branches: refs/heads/ui-vm-affinity bd8a9e920 -> 106961017 Fix command for executing injectkeys.sh Signed-off-by: Hugo Trippaers 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-vm-affinity Commit: 794e653c1325f6ba78b700f62e75c5a7b502c4eb Parents: 1f76d8b Author: Phong Nguyen Authored: Fri Apr 12 16:56:18 2013 -0400 Committer: Hugo Trippaers 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);