From patchwork Wed Oct 29 10:41:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 39753 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 44B5C24029 for ; Wed, 29 Oct 2014 10:42:56 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf1502763lbi.10 for ; Wed, 29 Oct 2014 03:42:55 -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=s2Sl/Mycx39FCEO8MLtAIs74+nW/DCiZdN2cmswz7K4=; b=hE2hnLcMyHPX3Jyr0WvBTDPkv/6GaeH3nBa1Vpmu6QsK6Eb/xALEuC1SWs5NGk16Jb cSxVgldHKk3j+JHF0ygg8EN7iDQvchp1Bk7y+deyxAwgUXFZse9BHqV2qdyPvcGzeXsY VqwGRMaE4NI7FtWCievkFYU51WxW7ZD4TBh9gGR9Uly8HhtMj+rPWw/o7t35SVtAhUAy g0ABKXICWsjMaV+GKR6Ui0A3f+28pp03lEkiTqRUd3+l66ZcNtxxe4EaE0rK5UDvZogf dw/A+SB7gvgTbEBNEq4HidX5ejzXjT7j0nEIxie8IsQtkpI2WBtLsoymVFxRqJ/UFTPI eP8Q== X-Gm-Message-State: ALoCoQmNeh87FcTA40v5liQWuE5neuKQ1QEgb0fLYt9GFBxPolB9IZzp4yfzZKwf6IKYSFem1rVc X-Received: by 10.194.91.208 with SMTP id cg16mr161647wjb.5.1414579375082; Wed, 29 Oct 2014 03:42:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.13 with SMTP id bc13ls183067lab.21.gmail; Wed, 29 Oct 2014 03:42:54 -0700 (PDT) X-Received: by 10.152.87.131 with SMTP id ay3mr1988485lab.97.1414579374797; Wed, 29 Oct 2014 03:42:54 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id j9si6669052lab.13.2014.10.29.03.42.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id z11so227570lbi.5 for ; Wed, 29 Oct 2014 03:42:54 -0700 (PDT) X-Received: by 10.152.5.38 with SMTP id p6mr10354948lap.44.1414579374702; Wed, 29 Oct 2014 03:42:54 -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 c5csp633478lbz; Wed, 29 Oct 2014 03:42:53 -0700 (PDT) X-Received: by 10.229.106.68 with SMTP id w4mr14323902qco.18.1414579370925; Wed, 29 Oct 2014 03:42:50 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k2si6682083qai.124.2014.10.29.03.42.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:50 -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 1XjQhW-0002Wo-Su; Wed, 29 Oct 2014 10:42:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XjQhS-0002PP-SE for xen-devel@lists.xen.org; Wed, 29 Oct 2014 10:41:58 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id BA/96-02712-574C0545; Wed, 29 Oct 2014 10:41:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1414579314!8540327!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21802 invoked from network); 29 Oct 2014 10:41:56 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 29 Oct 2014 10:41:56 -0000 X-IronPort-AV: E=Sophos;i="5.04,809,1406592000"; d="scan'208";a="186004747" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 29 Oct 2014 06:41:55 -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 1XjQhO-00014n-Ke; Wed, 29 Oct 2014 10:41:55 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 29 Oct 2014 10:41:54 +0000 From: Ian Campbell To: Date: Wed, 29 Oct 2014 10:41:34 +0000 Message-ID: <1414579302-6692-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414579268.29975.13.camel@citrix.com> References: <1414579268.29975.13.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 12/20] 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.174 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 <