From patchwork Fri Oct 10 12:02:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 38575 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B5BCC21177 for ; Fri, 10 Oct 2014 12:03:51 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf2028989lbv.8 for ; Fri, 10 Oct 2014 05:03:50 -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=dEY/dPOOPYqBw9oxpZmI152ek0U5cE2HcZKQazvDPQA=; b=mov8TpamLWGI1el5aGbMgPE7uY89Rq69SSx5N3y5GnZu9yZpDBh3qyovJ9XBEKQU3r R0aD6MueCT/n1Xxyzi/uFX65VAmJZso2f/h+dwo4xV77SmlZGfw4rbjPaW33fyUzcjMF iyhRpWVtzs8Ln1tZwwi77+HV8Dvf55C0GRNBO8D9ubHc2juUcmhN9fDfDhHGzx2Dt3xU cca6/CeczHolVG/h9chdFJ0OFvUlzd6tQ5x8z2peFjAKyMcSkbJ96sWtRzT8EWIpZmQG lnVbNf8lPKajwCe0Rt6pejRecdF3lLD7w4DW1ZfCovhBeb3a8J3d4po3ATnYTT+BVywG XAXw== X-Gm-Message-State: ALoCoQk7BOyr0Xvh0+G8JQxPbXcAdS20cYgzppWk8UcGlnKS+5f67dTYS1Xx35YH6+C8bgsbtr6S X-Received: by 10.180.160.169 with SMTP id xl9mr968009wib.7.1412942630575; Fri, 10 Oct 2014 05:03:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.167 with SMTP id uf7ls282691lac.100.gmail; Fri, 10 Oct 2014 05:03:50 -0700 (PDT) X-Received: by 10.152.36.67 with SMTP id o3mr4355304laj.45.1412942630382; Fri, 10 Oct 2014 05:03:50 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id l7si8977004lae.29.2014.10.10.05.03.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so2885917lbi.25 for ; Fri, 10 Oct 2014 05:03:50 -0700 (PDT) X-Received: by 10.152.22.42 with SMTP id a10mr4455226laf.56.1412942630156; Fri, 10 Oct 2014 05:03:50 -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 c5csp414359lbz; Fri, 10 Oct 2014 05:03:49 -0700 (PDT) X-Received: by 10.52.166.102 with SMTP id zf6mr402811vdb.62.1412942627319; Fri, 10 Oct 2014 05:03:47 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z12si6622977vcz.54.2014.10.10.05.03.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:47 -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 1XcYuZ-0002el-2y; Fri, 10 Oct 2014 12:03:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XcYuX-0002c6-K6 for xen-devel@lists.xen.org; Fri, 10 Oct 2014 12:03:05 +0000 Received: from [85.158.137.68:30276] by server-11.bemta-3.messagelabs.com id 70/B9-01568-8FAC7345; Fri, 10 Oct 2014 12:03:04 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1412942579!12742925!4 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.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3637 invoked from network); 10 Oct 2014 12:03:04 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 10 Oct 2014 12:03:04 -0000 X-IronPort-AV: E=Sophos;i="5.04,691,1406592000"; d="scan'208";a="180116954" 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:41 -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 1XcYu8-0008Tc-4s; Fri, 10 Oct 2014 13:02:41 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 10 Oct 2014 13:02:40 +0100 From: Ian Campbell To: Date: Fri, 10 Oct 2014 13:02:21 +0100 Message-ID: <1412942554-752-6-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 06/19] 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.217.180 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 <