From patchwork Wed Oct 29 10:41:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 39760 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 8E8D524029 for ; Wed, 29 Oct 2014 10:43:29 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf1508146lab.5 for ; Wed, 29 Oct 2014 03:43:28 -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=hThygqevMuLyTy6gaDOJiO2sTTMTb1YefRrEmuTSN30=; b=mPzwUCzmueD+ErLRh/qY9TEdbtBuLtHj9RqaPGq62J229boRqlCVOh+PGCufw4RbHx aE7Ycx/WFM8qh8gdc9QvORIH9BwzoS6X2pHtYz37v+Uag3KqvBel1vs0tCXWOJ6voCux q+5pzszbwzJ/BKXJ0CzMjLBBwp/yTsuaqdg+YJXaK04bY7JyYHvYuopvH6+dqZwTtWQZ up/uB/d4IBA970WwO4ZYbyEa44NsxYLPdNDZjFhDE5t1UEJAX1SWyy9vqO4FNhQsIJPG C3bUlcRlOfLRhVcMl8wHh3CHZMSN4l4wBKnzrOsUC0GJUiigKknYyZ6xhPdkWzMBjzl9 HsTA== X-Gm-Message-State: ALoCoQmW6EyzyOVfEXEvrXOFSopHitTCIcfxEAmD0C7JERDs+8Sfahf3iKn0eJHl0/cSo289LEWs X-Received: by 10.152.3.168 with SMTP id d8mr1624167lad.0.1414579408321; Wed, 29 Oct 2014 03:43:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.5 with SMTP id ca5ls142506lad.68.gmail; Wed, 29 Oct 2014 03:43:27 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr10541027lbb.46.1414579407771; Wed, 29 Oct 2014 03:43:27 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id j9si6606152lag.75.2014.10.29.03.43.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:43:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so2479276lbj.13 for ; Wed, 29 Oct 2014 03:43:27 -0700 (PDT) X-Received: by 10.152.5.38 with SMTP id p6mr10358133lap.44.1414579407689; Wed, 29 Oct 2014 03:43:27 -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 c5csp633543lbz; Wed, 29 Oct 2014 03:43:27 -0700 (PDT) X-Received: by 10.220.202.72 with SMTP id fd8mr2900372vcb.59.1414579406292; Wed, 29 Oct 2014 03:43:26 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id g15si2253926vdh.77.2014.10.29.03.43.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:43:26 -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 1XjQhO-0002Ko-Tg; Wed, 29 Oct 2014 10:41:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XjQhN-0002IJ-3K for xen-devel@lists.xen.org; Wed, 29 Oct 2014 10:41:53 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 66/AB-02693-074C0545; Wed, 29 Oct 2014 10:41:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1414579309!11733795!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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26321 invoked from network); 29 Oct 2014 10:41:51 -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:51 -0000 X-IronPort-AV: E=Sophos;i="5.04,809,1406592000"; d="scan'208";a="187318364" 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:49 -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 1XjQhI-00013y-Dd; Wed, 29 Oct 2014 10:41:49 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 29 Oct 2014 10:41:48 +0000 From: Ian Campbell To: Date: Wed, 29 Oct 2014 10:41:28 +0000 Message-ID: <1414579302-6692-6-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 06/20] ts-host-install: include console before *and* after the -- marker. 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.182 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: As of v3.15 Linux now stop parsing its command line at the -- mark and passes the remainder to init. This has broken Debian Installer's feature where anything after the -- is propagated to the installed system. See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 To work around this we need to pass console= twice, once before the -- for the current kernel's use and then again after the -- which is propagated to the installed system. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- ts-host-install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ts-host-install b/ts-host-install index 881c2fd..c611ed1 100755 --- a/ts-host-install +++ b/ts-host-install @@ -208,12 +208,16 @@ END push @installcmdline, get_host_property($ho, "install-append $ho->{Suite}", ''); - push @installcmdline, qw(--); - my $console = get_host_native_linux_console($ho); push @installcmdline, "console=$console" unless $console eq "NONE"; + push @installcmdline, qw(--); + + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for + # why this is repeated. + push @installcmdline, "console=$console" unless $console eq "NONE"; + my $installcmdline= join ' ', @installcmdline; setup_pxeboot($ho, <