From patchwork Fri Oct 10 12:02:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 38580 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9979220D3D for ; Fri, 10 Oct 2014 12:03:57 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf2043777lab.7 for ; Fri, 10 Oct 2014 05:03:53 -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=NtJKb/AdiRoE22UAmmRoW9M3z2IZEapFEuG6XIEI3M8=; b=HED5W0P7s095GX98acipsdZ2Ly3/LxJv1HkSI+k46MUL9LkuBEQ2ZE4MMVr359kFEK qr+0BTbGDiVG++dvd12HCqnCzfJ7+dsZzxh7sb1yqzJzL/xULNnnPRXMJYI0Cep+yLiw s1EXaC7aBEPHqCz48Jbs/RCB1+RfIC4nybGlAkqHeSnB0MwhUi/+sARvNyjGlRXpJpB9 3wQf9ei/p5gQx6w/GgBC8XS07uUXCr5CuHgCU06UltGi5lsroHY6C6lzBWLK9/nx6Kcg 2o2UihymilP+t4JEFt093eTuqDrW/oy4neVG7hEZRvfkEo/CUZK+tFdmWoSoTagtPcp7 PVVw== X-Gm-Message-State: ALoCoQnBWfD2kwVWQMXl3m8pHkhdvzHAVSir4kbXm6pIR1bObpaIDGsWvXAF96qFq/qvB0fckcZt X-Received: by 10.112.163.39 with SMTP id yf7mr868160lbb.7.1412942633850; Fri, 10 Oct 2014 05:03:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.132 with SMTP id ay4ls259817lab.46.gmail; Fri, 10 Oct 2014 05:03:53 -0700 (PDT) X-Received: by 10.112.144.228 with SMTP id sp4mr4249855lbb.54.1412942633523; Fri, 10 Oct 2014 05:03:53 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by mx.google.com with ESMTPS id rm7si8921614lbb.55.2014.10.10.05.03.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:53 -0700 (PDT) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id q1so3099293lam.36 for ; Fri, 10 Oct 2014 05:03:53 -0700 (PDT) X-Received: by 10.152.23.170 with SMTP id n10mr4354312laf.29.1412942633390; Fri, 10 Oct 2014 05:03:53 -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 c5csp414368lbz; Fri, 10 Oct 2014 05:03:52 -0700 (PDT) X-Received: by 10.224.161.139 with SMTP id r11mr8225165qax.68.1412942631844; Fri, 10 Oct 2014 05:03:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id c3si10745665qch.36.2014.10.10.05.03.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:51 -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-0002fr-NS; 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 1XcYuY-0002dT-B9 for xen-devel@lists.xen.org; Fri, 10 Oct 2014 12:03:06 +0000 Received: from [85.158.137.68:30368] by server-7.bemta-3.messagelabs.com id CC/7C-01084-9FAC7345; Fri, 10 Oct 2014 12:03:05 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1412942579!12742925!5 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 3671 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="180116961" 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:42 -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 1XcYu9-0008Tf-5u; Fri, 10 Oct 2014 13:02:42 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 10 Oct 2014 13:02:41 +0100 From: Ian Campbell To: Date: Fri, 10 Oct 2014 13:02:22 +0100 Message-ID: <1412942554-752-7-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: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH RFC OSSTEST 07/19] 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=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) 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 cf9506d..cdbd774 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, <