fixes to ts-debian-hvm-install
cover fixes to ts-debian-hvm-install
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 1/3 ts-debian-hvm-install: Remove VGA console runes.
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.
--- ts-debian-hvm-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
ts-debian-hvm-install +2 -2
@@ -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 }
Signature · 1 line
2.1.4
Re: [PATCH OSSTEST 1/3] ts-debian-hvm-install: Remove VGA console runes.
Ian Campbell writes ("[PATCH OSSTEST 1/3] ts-debian-hvm-install: Remove VGA console runes."):
Quoted 1 line
I don't think there is any point in these since
60b6d20b0fd2
That commit is actually c60b6d20b0fd !
Quoted 3 lines
"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
Ian.
PATCH 2/3 ts-debian-hvm-install: di_installcmdline_core
In reply to Ian CampbellThis 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.
--- Osstest/Debian.pm | 4 +++- ts-debian-hvm-install | 27 +++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-)
Osstest/Debian.pm +3 -1
@@ -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" );
ts-debian-hvm-install +25 -2
@@ -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 }
Signature · 1 line
2.1.4
Re: [PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core
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
Quoted 5 lines · Wei Liu
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 2/3] ts-debian-hvm-install: di_installcmdline_core
In reply to Ian CampbellIan Campbell writes ("[PATCH OSSTEST 2/3] ts-debian-hvm-install: di_installcmdline_core"):
Quoted 2 lines
This is primarily to get DEBIAN_FRONTEND=test, for easier to read logging.
...
Quoted 8 lines
sub
grub_cfg() {ts-debian-hvm-install +7
-0+ my @dicmdline = (); + my $gconsole = "console=ttyS0,115200n8"; + + push @dicmdline, $gconsole; + push @dicmdline, di_installcmdline_core($gho, '/preseed.cfg', + PreseedScheme => 'file'); + push @dicmdline, "--";
...
Quoted 4 lines
sub
isolinux_cfg() {ts-debian-hvm-install +3
-0+ my @dicmdline = (); + my $gconsole = "console=ttyS0,115200n8"; +
ts-debian-hvm-install END · line 138
Quoted 10 lines
ts-debian-hvm-install +8
-0+ 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.
PATCH 3/3 ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs.
In reply to Ian CampbellThe 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.
--- ts-debian-hvm-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ts-debian-hvm-install +1 -1
@@ -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 }
Signature · 1 line
2.1.4
Re: [PATCH OSSTEST 3/3] ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs.
Ian Campbell writes ("[PATCH OSSTEST 3/3] ts-debian-hvm-install: Use xargs -0 to avoid massive filelist in logs."):
Quoted 3 lines
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.
Ian.