| Message ID | 1459947777-26011-3-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei Liu writes ("[PATCH OSSTEST RFC 2/2] Make guest cdrom empty after installation completes"):
> Previously an iso image that contains nothing was inserted to cdrom
> after guest installation had finished.
>
> With this patch we make cdrom really empty. This helps catch bug that
> prevents booting hvm guest with empty cdrom drive.
>
> Remove empty iso image generate in ts-{debian-hvm,redhat}-install as
> well.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
However, given the bugs currently being discussed, and the fact that
we're currently in a pre-freeze crunch, I'm reluctant to push this to
osstest staging right now.
On any stable branches with empty cd bugs, it would immediately fail
and cause blockages.
I'd like to make this change during the 4.7 freeze period, after fixes
for these bugs are available in staging. During the freeze the fixes
can be backported to stable branches.
Thanks,
Ian.
On Wed, Apr 06, 2016 at 04:02:21PM +0100, Ian Jackson wrote: > Wei Liu writes ("[PATCH OSSTEST RFC 2/2] Make guest cdrom empty after installation completes"): > > Previously an iso image that contains nothing was inserted to cdrom > > after guest installation had finished. > > > > With this patch we make cdrom really empty. This helps catch bug that > > prevents booting hvm guest with empty cdrom drive. > > > > Remove empty iso image generate in ts-{debian-hvm,redhat}-install as > > well. > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > However, given the bugs currently being discussed, and the fact that > we're currently in a pre-freeze crunch, I'm reluctant to push this to > osstest staging right now. > > On any stable branches with empty cd bugs, it would immediately fail > and cause blockages. > > I'd like to make this change during the 4.7 freeze period, after fixes > for these bugs are available in staging. During the freeze the fixes > can be backported to stable branches. > I agree. I stated more or less the same opinion in cover letter. :-) Wei. > Thanks, > Ian.
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 8b15b6d..f06db51 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2509,11 +2509,11 @@ sub iso_copy_content_from_image($$) { END } -sub guest_editconfig_postinstall ($$) { - my ($gho,$emptyiso) = @_; +sub guest_editconfig_postinstall ($) { + my ($gho) = @_; guest_editconfig($gho->{Host}, $gho, sub { if (m/^\s*disk\s*\=/ .. /\]/) { - s/\Q$gho->{Rimage}\E/$emptyiso/; + s/\Q$gho->{Rimage}\E//; } s/^on_reboot.*/on_reboot='restart'/; }); diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index d174c55..b8a2ae2 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -181,8 +181,6 @@ sub prepare_initrd ($$$) { END } -our $emptyiso= "/root/$flight.$job.$gn-empty.iso"; - sub iso_path ($$) { my ($which, $deftail) = @_; my $v = guest_var($gho, "iso_$which", "/install.amd/$deftail"); @@ -213,8 +211,6 @@ sub prep () { -no-emul-boot -r); - iso_create_empty($ho, $emptyiso, $emptydir); - my $extra_config = ''; $extra_config .= "nestedhvm=1\n" if guest_var_boolean($gho,"enable_nestedhvm"); @@ -283,7 +279,7 @@ if ($stage<2) { guest_destroy($gho); } -guest_editconfig_postinstall($gho,$emptyiso); +guest_editconfig_postinstall($gho); guest_create($gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho); diff --git a/ts-redhat-install b/ts-redhat-install index 89e0a5f..a950778 100755 --- a/ts-redhat-install +++ b/ts-redhat-install @@ -106,8 +106,6 @@ ENDKEYS END } -our $emptyiso= "/root/$flight.$job.$gn-empty.iso"; - sub prep () { target_install_packages_norec($ho, qw(lvm2 rsync genisoimage)); @@ -120,8 +118,6 @@ sub prep () { my $newiso= "/root/$flight.$job.$gn-newiso"; my $emptydir= "/root/$flight.$job.$gn-empty-dir"; - iso_create_empty($ho, $emptyiso, $emptydir); - my @isogen= iso_gen_flags_basic(); more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb, @@ -158,7 +154,7 @@ if ($stage<2) { guest_destroy($gho); } -guest_editconfig_postinstall($gho,$emptyiso); +guest_editconfig_postinstall($gho); guest_create($gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho);
Previously an iso image that contains nothing was inserted to cdrom after guest installation had finished. With this patch we make cdrom really empty. This helps catch bug that prevents booting hvm guest with empty cdrom drive. Remove empty iso image generate in ts-{debian-hvm,redhat}-install as well. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Osstest/TestSupport.pm | 6 +++--- ts-debian-hvm-install | 6 +----- ts-redhat-install | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-)