From patchwork Wed Oct 29 10:41: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: 39742 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D4A7A24029 for ; Wed, 29 Oct 2014 10:42:38 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id ex7sf1766986wid.4 for ; Wed, 29 Oct 2014 03:42:38 -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=hr301MfXdx+KwmI/W+TSZT5Rh/1cX3vlgSjVUwt1ZYk=; b=D/7jJLpFoOcxliCJVXE/goZMxBnEtQZ/m++cuezCs+/3fJjdnlVAMJSR2gVKqE20MQ 13g9FxEKvP7oRELqhNeF57hjhDDRatEQSs5q1/HEEcsP4yj1NtGld/khVsc7wCdrmgx/ OUy7vizFL/PqgiktBDfVIJM59pJv1WQ9u8BhEUsdHD/2w/64K3P3txUGG414f9jyr+w0 CK/Twh6RfIr2QUa6nGCwpJ04ZvP4MbfDHqfhtJ3EzR9q7Bgyfr7Jqd8KidQKGblB6BKZ QB9/C5mMQDC6X+g1m6X3G6HIGvNkYZEzUEP+EPSfwHIqEBaY2FXP1CIERolFjmT2cwoK vahA== X-Gm-Message-State: ALoCoQkBZHvFct2rO5ZHxXq4hBrW1gXrdYEiYHrb/QMGLqsNjvAlgfZTn1zPiErjDL0gSEzgR1Nj X-Received: by 10.181.8.194 with SMTP id dm2mr5982895wid.2.1414579358039; Wed, 29 Oct 2014 03:42:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.227 with SMTP id e3ls182828laa.69.gmail; Wed, 29 Oct 2014 03:42:37 -0700 (PDT) X-Received: by 10.152.20.199 with SMTP id p7mr10466272lae.49.1414579357837; Wed, 29 Oct 2014 03:42:37 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id l2si6632360lbc.48.2014.10.29.03.42.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id ge10so2260842lab.2 for ; Wed, 29 Oct 2014 03:42:37 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr10335375lbw.66.1414579357635; Wed, 29 Oct 2014 03:42:37 -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 c5csp633444lbz; Wed, 29 Oct 2014 03:42:36 -0700 (PDT) X-Received: by 10.224.53.131 with SMTP id m3mr14016018qag.85.1414579355830; Wed, 29 Oct 2014 03:42:35 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id x5si6754611qax.64.2014.10.29.03.42.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:35 -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 1XjQhM-0002IU-WD; Wed, 29 Oct 2014 10:41:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XjQhM-0002Hh-4I for xen-devel@lists.xen.org; Wed, 29 Oct 2014 10:41:52 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id FB/2E-02696-F64C0545; Wed, 29 Oct 2014 10:41:51 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1414579309!11733795!1 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 26283 invoked from network); 29 Oct 2014 10:41:50 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 29 Oct 2014 10:41:50 -0000 X-IronPort-AV: E=Sophos;i="5.04,809,1406592000"; d="scan'208";a="187318362" 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:48 -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 1XjQhH-00013v-CU; Wed, 29 Oct 2014 10:41:48 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 29 Oct 2014 10:41:47 +0000 From: Ian Campbell To: Date: Wed, 29 Oct 2014 10:41:27 +0000 Message-ID: <1414579302-6692-5-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 05/20] ts-host-install: Refactor code to construct a Linux console= for a host 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.43 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: And reuse it in when writing the u-boot script for initial boot. This was previously hardcoded to ttyAMA which matches the production host DB for the current set of hosts which use this script. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 4 +++- Osstest/TestSupport.pm | 10 ++++++++++ ts-host-install | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index ab09abb..29dec3b 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -660,6 +660,8 @@ END if ( $ho->{Flags}{'need-uboot-bootscr'} ) { my $root=target_guest_lv_name($ho,"root"); + my $console = get_host_native_linux_console($ho); + my $consolecmd = "console=$console" unless $console eq "NONE"; preseed_hook_command($ho, 'late_command', $sfx, <\$r/boot/boot <