From patchwork Fri Nov 21 13:16:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41315 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D76FA244B0 for ; Fri, 21 Nov 2014 13:19:53 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id q1sf3028470lam.5 for ; Fri, 21 Nov 2014 05:19:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=79ljoHpKuiOM3QACQX0Hz8xa2VgGBMl7jD5dvfVUAxo=; b=QneRxNNUqLbe+kblOJDLhfKuR7EUH/HWkOBculNzzQIDCdL4Q40DET/n7ISkR5fY9G nKTQcFHdZG7ndWqBnFpR/zvJlwS9Wi0Jro0ld0thIcGS2bQJo7bUggADJMfp7YrSnY6n CpA6ga3XRYSEbkgmQa9eyG71AUzVC9xIjzTuTMpgj2sK6ogRyHeVhCWM/ZT0HEkdT5Zo z6qHu1vREd01L4TiC1ofXIqfJSeFFmnM7AhrdYr4qq4oUB983g85f6fHOtxZ7j3jXX7i hW9EaT/92/rkWk/td3JeQs5vQzGA1lqqeHIAiDKnBIO8EiCNeUP0T6Cu+sAkmqrwXLlL yAeg== X-Gm-Message-State: ALoCoQkmJ5z5o1Dhx7Xj9Xji0BDtZZSIGX4Hu/PN9EFnyWB6kHSi+LEHQtd7d0yS93Dl/orMkraX X-Received: by 10.112.168.228 with SMTP id zz4mr566357lbb.7.1416575990430; Fri, 21 Nov 2014 05:19:50 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.4 with SMTP id i4ls213206laf.59.gmail; Fri, 21 Nov 2014 05:19:49 -0800 (PST) X-Received: by 10.112.169.6 with SMTP id aa6mr4554740lbc.29.1416575989927; Fri, 21 Nov 2014 05:19:49 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id l2si5319086lbp.76.2014.11.21.05.19.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id ge10so4206155lab.3 for ; Fri, 21 Nov 2014 05:19:49 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr4501619lbo.32.1416575989026; Fri, 21 Nov 2014 05:19:49 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp87326lbc; Fri, 21 Nov 2014 05:19:48 -0800 (PST) X-Received: by 10.52.163.168 with SMTP id yj8mr3731345vdb.61.1416575984980; Fri, 21 Nov 2014 05:19:44 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ic8si2207250vdb.107.2014.11.21.05.19.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:44 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5L-0007GQ-BU; Fri, 21 Nov 2014 13:17:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5J-0007G2-FW for xen-devel@lists.xen.org; Fri, 21 Nov 2014 13:17:13 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 43/06-27785-85B3F645; Fri, 21 Nov 2014 13:17:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1416575829!13439228!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4592 invoked from network); 21 Nov 2014 13:17:12 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Nov 2014 13:17:12 -0000 X-IronPort-AV: E=Sophos;i="5.07,431,1413244800"; d="scan'208";a="195229136" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 21 Nov 2014 08:17:11 -0500 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xro5G-0003Af-2r; Fri, 21 Nov 2014 13:17:11 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 21 Nov 2014 13:17:10 +0000 From: Ian Campbell To: Date: Fri, 21 Nov 2014 13:16:55 +0000 Message-ID: <1416575824-15555-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1416505070.26869.2.camel@citrix.com> References: <1416505070.26869.2.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v3 06/15] Osstest/Debian: Refactor code to set bootargs in u-boot script X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index c8db601..33a4ca4 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -660,9 +660,15 @@ END } if ( $ho->{Flags}{'need-uboot-bootscr'} ) { + my @bootargs; + my $root=target_guest_lv_name($ho,"root"); - my $console = get_host_native_linux_console($ho); - my $consolecmd = "console=$console" unless $console eq "NONE"; + my $console=get_host_native_linux_console($ho); + + push @bootargs, "root=$root"; + push @bootargs, "console=$console" unless $console eq "NONE"; + + my $bootargs = join ' ', @bootargs; preseed_hook_command($ho, 'late_command', $sfx, <\$r/boot/boot <