| Message ID | 1459947777-26011-2-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei Liu writes ("[PATCH OSSTEST RFC 1/2] Testsupport: rename guest_editconfig_nocd to _postinstall"):
> It does more than just replacing the disc in cdrom. It also modifies
> guest reboot action.
I think this probably ought to be called `midinstall' or something.
The installation isn't complete until firstboot stuff is done.
With that change,
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian.
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 9e6479a..8b15b6d 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -119,7 +119,7 @@ BEGIN { iso_create_empty iso_gen_flags_basic iso_copy_content_from_image - guest_editconfig_nocd + guest_editconfig_postinstall host_install_postboot_complete target_core_dump_setup ); @@ -2509,7 +2509,7 @@ sub iso_copy_content_from_image($$) { END } -sub guest_editconfig_nocd ($$) { +sub guest_editconfig_postinstall ($$) { my ($gho,$emptyiso) = @_; guest_editconfig($gho->{Host}, $gho, sub { if (m/^\s*disk\s*\=/ .. /\]/) { diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 7521d57..d174c55 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -283,7 +283,7 @@ if ($stage<2) { guest_destroy($gho); } -guest_editconfig_nocd($gho,$emptyiso); +guest_editconfig_postinstall($gho,$emptyiso); guest_create($gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho); diff --git a/ts-redhat-install b/ts-redhat-install index 10da559..89e0a5f 100755 --- a/ts-redhat-install +++ b/ts-redhat-install @@ -158,7 +158,7 @@ if ($stage<2) { guest_destroy($gho); } -guest_editconfig_nocd($gho,$emptyiso); +guest_editconfig_postinstall($gho,$emptyiso); guest_create($gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho);
It does more than just replacing the disc in cdrom. It also modifies guest reboot action. No functional change. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Osstest/TestSupport.pm | 4 ++-- ts-debian-hvm-install | 2 +- ts-redhat-install | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)