From patchwork Fri Oct 10 12:02:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 38583 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E9046202DB for ; Fri, 10 Oct 2014 12:10:31 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf2124250eek.9 for ; Fri, 10 Oct 2014 05:10:31 -0700 (PDT) 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:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=9bPZB1laPon7LrBe7OvUjsvejYoc57MZIfac/LTkiaM=; b=fITTcgyMfZANZY7uBrJtnQbRvo8x1JaS5Qfp90E7m6V5DW+q4ydXgYLNEI5q2Xy/9p j7W+nKzMK6HCltTSoSFD9NzJfrRqXG0YOA/VTltzb1qbcp4CpoW3dSGiHcMtDzXQJ26U GzcaaA9NUb/FWrG7FNkmxwWCe8eWjh5p4jmC+swRigPSGxLg9sFjniqh+38meuwFiW6Z MGVSG4UiT7LgQ4Mf21O6iq+LpxEIjH68xSzYI3b6sO6eaIZ7X1/jdDUXNCVBK/3SjMF4 SdHnRn4MBFEl1P3T28DEj4ArzokUbB7zFK2Hf77uL9BdQGETw1QYwgQ5h4C6Q5jhZAGQ /Suw== X-Gm-Message-State: ALoCoQnPaEFTfvf9WOL1AM44Ztv1mFRciuTrOdtD8N/oJ4iP263EsY5jsBBOVHvMGq4dTnVx6RqI X-Received: by 10.180.221.236 with SMTP id qh12mr971983wic.4.1412942621695; Fri, 10 Oct 2014 05:03:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.67 with SMTP id z3ls275994lag.74.gmail; Fri, 10 Oct 2014 05:03:41 -0700 (PDT) X-Received: by 10.152.205.9 with SMTP id lc9mr4253592lac.37.1412942621510; Fri, 10 Oct 2014 05:03:41 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id od3si8864559lbb.84.2014.10.10.05.03.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id l4so2957710lbv.10 for ; Fri, 10 Oct 2014 05:03:41 -0700 (PDT) X-Received: by 10.152.26.226 with SMTP id o2mr4427331lag.44.1412942621259; Fri, 10 Oct 2014 05:03:41 -0700 (PDT) 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.84.229 with SMTP id c5csp414331lbz; Fri, 10 Oct 2014 05:03:40 -0700 (PDT) X-Received: by 10.52.0.132 with SMTP id 4mr3463153vde.10.1412942620144; Fri, 10 Oct 2014 05:03:40 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ry8si6596875vdc.71.2014.10.10.05.03.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:40 -0700 (PDT) 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 1XcYuJ-0002O3-1c; Fri, 10 Oct 2014 12:02:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XcYuH-0002Ml-Gd for xen-devel@lists.xen.org; Fri, 10 Oct 2014 12:02:49 +0000 Received: from [85.158.143.35:41339] by server-1.bemta-4.messagelabs.com id 40/3D-05872-8EAC7345; Fri, 10 Oct 2014 12:02:48 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1412942558!11748672!5 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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10434 invoked from network); 10 Oct 2014 12:02:48 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Oct 2014 12:02:48 -0000 X-IronPort-AV: E=Sophos;i="5.04,691,1406592000"; d="scan'208";a="181281234" 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, 10 Oct 2014 08:02:47 -0400 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 1XcYuE-0008Tu-Bh; Fri, 10 Oct 2014 13:02:47 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 10 Oct 2014 13:02:46 +0100 From: Ian Campbell To: Date: Fri, 10 Oct 2014 13:02:27 +0100 Message-ID: <1412942554-752-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412942404.27111.12.camel@citrix.com> References: <1412942404.27111.12.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH RFC OSSTEST 12/19] 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.217.179 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 8f80eb4..3ffbc50 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 <