From patchwork Mon Feb 15 16:20:22 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chase Douglas <chase.douglas@canonical.com>
X-Patchwork-Id: 45400
X-Patchwork-Delegate: stefan.bader@canonical.com
Return-Path: <kernel-team-bounces@lists.ubuntu.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from chlorine.canonical.com (chlorine.canonical.com
	[91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5A36AB7CBD
	for <incoming@patchwork.ozlabs.org>;
	Tue, 16 Feb 2010 03:23:36 +1100 (EST)
Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.69)
	(envelope-from <kernel-team-bounces@lists.ubuntu.com>)
	id 1Nh3jO-0006KI-Dm; Mon, 15 Feb 2010 16:23:30 +0000
Received: from adelie.canonical.com ([91.189.90.139])
	by chlorine.canonical.com with esmtp (Exim 4.69)
	(envelope-from <chase.douglas@canonical.com>) id 1Nh3gl-0005gd-G8
	for kernel-team@lists.ubuntu.com; Mon, 15 Feb 2010 16:20:47 +0000
Received: from hutte.canonical.com ([91.189.90.181])
	by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian))
	id 1Nh3gk-00084A-3Y
	for <kernel-team@lists.ubuntu.com>; Mon, 15 Feb 2010 16:20:46 +0000
Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10]
	helo=canonical.com) by hutte.canonical.com with esmtpsa
	(TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69)
	(envelope-from <chase.douglas@canonical.com>) id 1Nh3gj-0008NX-4A
	for kernel-team@lists.ubuntu.com; Mon, 15 Feb 2010 16:20:46 +0000
From: Chase Douglas <chase.douglas@canonical.com>
To: kernel-team@lists.ubuntu.com
Subject: [PATCH 1/2] Fix remote command execution
Date: Mon, 15 Feb 2010 11:20:22 -0500
Message-Id: <1266250823-12394-2-git-send-email-chase.douglas@canonical.com>
X-Mailer: git-send-email 1.6.3.3
In-Reply-To: <1266250823-12394-1-git-send-email-chase.douglas@canonical.com>
References: <1266250823-12394-1-git-send-email-chase.douglas@canonical.com>
X-BeenThere: kernel-team@lists.ubuntu.com
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/kernel-team>
List-Post: <mailto:kernel-team@lists.ubuntu.com>
List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe>
MIME-Version: 1.0
Sender: kernel-team-bounces@lists.ubuntu.com
Errors-To: kernel-team-bounces@lists.ubuntu.com

The remote command execution through ssh was broken due to HEREDOC
usage within a subshell. This change breaks the command synthesis
into a separate variable that is then fed to ssh in a second step.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
 buildscripts/build-create-host |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/buildscripts/build-create-host b/buildscripts/build-create-host
index 50590d5..5bf163e 100755
--- a/buildscripts/build-create-host
+++ b/buildscripts/build-create-host
@@ -14,28 +14,28 @@ if [ "${HOST}" = "" ]; then
 	exit 1
 fi
 
-HOSTINFO="$(cat <<EOD | ssh ${HOST} -oConnectTimeout=60
-if [ "\`type -p dpkg-architecture\`" != "" ]; then
-	echo HOSTARCH="\`dpkg-architecture -qDEB_BUILD_ARCH\`"
+CMD='if [ "\`type -p dpkg-architecture\`" != "" ]; then
+	echo HOSTARCH="\`dpkg-architecture -qDEB_BUILD_ARCH\`";
 else
-	echo HOSTARCH="\`dpkg --print-architecture\`"
-fi
+	echo HOSTARCH="\`dpkg --print-architecture\`";
+fi;
 if [ "\`type -p schroot\`" != "" ]; then
-	CHROOTCMD="schroot"
+	CHROOTCMD="schroot";
 elif [ "\`type -p dchroot\`" != "" ]; then
-	CHROOTCMD="dchroot"
+	CHROOTCMD="dchroot";
 else
-	exit 1
-fi
-echo "CHROOTCMD=\$CHROOTCMD"
+	exit 1;
+fi;
+echo "CHROOTCMD=$CHROOTCMD";
 
-if [ \`id -u\` -ne 0 ]; then
-	echo "FAKEROOT=fakeroot"
+if [ `id -u` -ne 0 ]; then
+	echo "FAKEROOT=fakeroot";
 else
-	echo "FAKEROOT=''"
-fi
-echo "BASE=\$HOME"
-EOD)"
+	echo "FAKEROOT=\"\"";
+fi;
+echo "BASE=$HOME"'
+
+HOSTINFO=$(echo $CMD | ssh ${HOST} -oConnectTimeout=60)
 
 case $? in
 	255)