]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
ts-debian-hvm-install: Arrange for installed guest to use a serial console
authorIan Campbell <ian.campbell@citrix.com>
Mon, 6 Jul 2015 13:45:12 +0000 (14:45 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jul 2015 10:39:49 +0000 (11:39 +0100)
So that the guest boot will be logged somewhere useful (the qemu-dm
log).

It still seems to pickup a "quiet" from somewhere, so it's not as
useful as it might be, but it is an improvement.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
ts-debian-hvm-install

index ea2d1ad75462d799b8635ea609c4bd9c50c4f7a0..f05b1a752d0f95a328e01d9255f0e8254a9b0934 100755 (executable)
@@ -98,19 +98,22 @@ END
 }
 
 sub grub_cfg () {
-
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
+    # why console= is repeated.
     return <<"END";
 set default="0"
 set timeout=5
 
 menuentry 'debian guest auto Install' {
-    linux /install.amd/vmlinuz console=vga console=ttyS0,115200n8 preseed/file=/preseed.cfg
+    linux /install.amd/vmlinuz console=vga preseed/file=/preseed.cfg console=ttyS0,115200n8 -- console=ttyS0,115200n8
     initrd /install.amd/initrd.gz
 }
 END
 }
 
 sub isolinux_cfg () {
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
+    # why console= is repeated.
     return <<"END";
     default autoinstall
     prompt 0
@@ -118,7 +121,7 @@ sub isolinux_cfg () {
 
     label autoinstall
         kernel /install.amd/vmlinuz
-        append video=vesa:ywrap,mtrr vga=788 console=ttyS0,115200n8 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz
+        append video=vesa:ywrap,mtrr vga=788 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz console=ttyS0,115200n8 -- console=ttyS0,115200n8
 END
 }