[Xen-devel] [OSSTEST PATCH v2 3/5] ts-debian-hvm-install: Use ---, and no longer duplicate $gconsole

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

In October 2014, debian-installer was updated to honour `---' in the
way it previously honoured `--': #762007.  If we use that instead,
we don't need to duplicate $gconsole any more.

This, effectively, reverts
  db26f5825a21269d9218417a9ca40bc5d47755d2
  ts-host-install: include console before *and* after the -- marker.

In principle this ought to be changed only in "recent enough" Debian
suites, but certainly at least jessie has the fix and jessie is quite
broken now, so let's not bother with making it conditional.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 ts-debian-hvm-install | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index ed8803ed..a01cfb2b 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -124,7 +124,6 @@ sub gcmdline (;$) {
     my @dicmdline = ();
     my $gconsole = "console=ttyS0,115200n8";
 
-    push @dicmdline, $gconsole;
     push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg',
                                            PreseedScheme => 'file');
     push @dicmdline, $extra if $extra;
@@ -132,9 +131,8 @@ sub gcmdline (;$) {
     my $append = target_var($gho,'linux_boot_append');
     push @dicmdline, $append if $append;
 
-    push @dicmdline, "--";
-    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
-    # why console= is repeated.
+    push @dicmdline, "---";
+
     push @dicmdline, $gconsole;
 
     return join(" ", @dicmdline);
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel