From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 06/20] ts-host-install: include console before *and* after the -- marker. Date: Wed, 29 Oct 2014 10:41:28 +0000 Message-ID: <1414579302-6692-6-git-send-email-ian.campbell@citrix.com> References: <1414579268.29975.13.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1414579268.29975.13.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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, <