[PATCH OSSTEST 0/3] fixes to ts-debian-hvm-install

[PATCH OSSTEST 0/3] fixes to ts-debian-hvm-install

[Ian Campbell]

The main one is the middle one which would have made
http://logs.test-lab.xenproject.org/osstest/logs/59681/test-amd64-i386-xl-qemuu-debianhvm-amd64/info.html a lot easier to read due to the DEBIAN_FRONTEND=text.

[PATCH OSSTEST 1/3] ts-debian-hvm-install: Remove VGA console runes.

[Ian Campbell]

I don't think there is any point in these since 60b6d20b0fd2
"ts-debian-hvm-install: Arrange for installed guest to use a serial
console" and they represent an unexplained difference between the
islinux and grub cases.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ts-debian-hvm-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index f05b1a7..0c94c7e 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -105,7 +105,7 @@ set default="0"
 set timeout=5
 
 menuentry 'debian guest auto Install' {
-    linux /install.amd/vmlinuz console=vga preseed/file=/preseed.cfg console=ttyS0,115200n8 -- console=ttyS0,115200n8
+    linux /install.amd/vmlinuz preseed/file=/preseed.cfg console=ttyS0,115200n8 -- console=ttyS0,115200n8
     initrd /install.amd/initrd.gz
 }
 END
@@ -121,7 +121,7 @@ sub isolinux_cfg () {
 
     label autoinstall
         kernel /install.amd/vmlinuz
-        append video=vesa:ywrap,mtrr vga=788 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz console=ttyS0,115200n8 -- console=ttyS0,115200n8
+        append preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz console=ttyS0,115200n8 -- console=ttyS0,115200n8
 END
 }
 
-- 
2.1.4

[PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core

[Ian Campbell]

This is primarily to get DEBIAN_FRONTEND=test, for easier to read
logging.

Previously the command line consisted of the console and
preseed/file=/preseed.cfg. After this it is more complex.

The preseed file uses file= which is an alias for preseed/file. Extra
options are given including DEBIAN_FRONTEND and DEBCONF_DEBUG and the
following are preseeded via the command line:

Previous implied were "auto=true preseed" which are now explicit.

In addition the following harmless (in this context) options are
added:
    hw-detect/load_firmware=
    hostname=
    netcfg/dhcp_timeout=
    netcfg/choose_interface=

The caller could also cause debconf/priority to be set, but doesn't
here.

ts-debian-di-install in the distro test series also uses
di_installcmdline_core for guest uses.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/Debian.pm     |  4 +++-
 ts-debian-hvm-install | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 718a7e2..8282918 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -627,6 +627,8 @@ our %preseed_cmds;
 sub di_installcmdline_core ($$;@) {
     my ($tho, $ps_url, %xopts) = @_;
 
+    $xopts{PreseedScheme} //= 'url';
+
     $ps_url =~ s,^http://,,;
 
     my $netcfg_interface= get_host_property($tho,'interface force','auto');
@@ -640,7 +642,7 @@ sub di_installcmdline_core ($$;@) {
     push @cl, (
                "DEBIAN_FRONTEND=$difront",
                "hostname=$tho->{Name}",
-               "url=$ps_url",
+               "$xopts{PreseedScheme}=$ps_url",
                "netcfg/dhcp_timeout=150",
                "netcfg/choose_interface=$netcfg_interface"
                );
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 0c94c7e..69f1217 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -98,22 +98,45 @@ END
 }
 
 sub grub_cfg () {
+    my @dicmdline = ();
+    my $gconsole = "console=ttyS0,115200n8";
+
+    push @dicmdline, $gconsole;
+    push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg',
+					    PreseedScheme => 'file');
+    push @dicmdline, "--";
     # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
     # why console= is repeated.
+    push @dicmdline, $gconsole;
+
+    my $cmdline = join(" ", @dicmdline);
+
     return <<"END";
 set default="0"
 set timeout=5
 
 menuentry 'debian guest auto Install' {
-    linux /install.amd/vmlinuz preseed/file=/preseed.cfg console=ttyS0,115200n8 -- console=ttyS0,115200n8
+    linux /install.amd/vmlinuz $cmdline
     initrd /install.amd/initrd.gz
 }
 END
 }
 
 sub isolinux_cfg () {
+    my @dicmdline = ();
+    my $gconsole = "console=ttyS0,115200n8";
+
+    push @dicmdline, $gconsole;
+    push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg',
+					    PreseedScheme => 'file');
+    push @dicmdline, "initrd=/install.amd/initrd.gz";
+    push @dicmdline, "--";
     # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
     # why console= is repeated.
+    push @dicmdline, $gconsole;
+
+    my $cmdline = join(" ", @dicmdline);
+
     return <<"END";
     default autoinstall
     prompt 0
@@ -121,7 +144,7 @@ sub isolinux_cfg () {
 
     label autoinstall
         kernel /install.amd/vmlinuz
-        append preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz console=ttyS0,115200n8 -- console=ttyS0,115200n8
+        append $cmdline
 END
 }
 
-- 
2.1.4

[PATCH OSSTEST 3/3] ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs.

[Ian Campbell]

The current arrangement is a bit odd, I'm not sure why it would be
that way and it results in a huge list of files in the middle of the
log which is rather boring to scroll through.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ts-debian-hvm-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 69f1217..8434f8f 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -160,7 +160,7 @@ sub prepare_initrd ($$$) {
       cd -
       rm -rf $initrddir
       cd $newiso
-      md5sum `find -L -type f -print0 | xargs -0` > md5sum.txt
+      find -L -type f -print0 | xargs -0 md5sum > md5sum.txt
       cd -
 END
 }
-- 
2.1.4

Re: [PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core

[Wei Liu]

The subject of this mail is very terse. I guess you meant

 ts-debian-hvm-install: *use* di_installcmdline_core

?

Wei.

Re: [PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core

[Ian Campbell]

On Mon, 2015-07-20 at 16:39 +0100, Wei Liu wrote:
> The subject of this mail is very terse. I guess you meant
> 
>  ts-debian-hvm-install: *use* di_installcmdline_core
> 
> ?

I did, I would even have sworn I typed that (or something very like it).
I may have driven vi wrongly at some point during the edit, sorry!

Ian.

Re: [PATCH OSSTEST 1/3] ts-debian-hvm-install: Remove VGA console runes.

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST 1/3] ts-debian-hvm-install: Remove VGA console runes."):
> I don't think there is any point in these since 60b6d20b0fd2

That commit is actually c60b6d20b0fd !

> "ts-debian-hvm-install: Arrange for installed guest to use a serial
> console" and they represent an unexplained difference between the
> islinux and grub cases.

Apart from that

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Ian.

Re: [PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core"):
> This is primarily to get DEBIAN_FRONTEND=test, for easier to read
> logging.
...
>  sub grub_cfg () {
> +    my @dicmdline = ();
> +    my $gconsole = "console=ttyS0,115200n8";
> +
> +    push @dicmdline, $gconsole;
> +    push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg',
> +					    PreseedScheme => 'file');
> +    push @dicmdline, "--";
...
>  sub isolinux_cfg () {
> +    my @dicmdline = ();
> +    my $gconsole = "console=ttyS0,115200n8";
> +
> +    push @dicmdline, $gconsole;
> +    push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg',
> +					    PreseedScheme => 'file');
> +    push @dicmdline, "initrd=/install.amd/initrd.gz";
> +    push @dicmdline, "--";
>      # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762007 for
>      # why console= is repeated.
> +    push @dicmdline, $gconsole;
> +
> +    my $cmdline = join(" ", @dicmdline);

These are uncomfortably similar, don't you think ?

Ian.

Re: [PATCH OSSTEST 3/3] ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs.

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST 3/3] ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs."):
> The current arrangement is a bit odd, I'm not sure why it would be
> that way and it results in a huge list of files in the middle of the
> log which is rather boring to scroll through.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Ian.