[Libguestfs] [PATCH 1/2] v2v: linux: install linux tools after unconfigurations

[Pino Toscano]

Install the new tools after removing the old hypervisor tools.

It should not change the result of the conversion.
---
 v2v/convert_linux.ml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index f9e811c8d..f02ba373e 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -81,8 +81,6 @@ let convert (g : G.guestfs) inspect source output rcaps =
   let rec do_convert () =
     augeas_grub_configuration ();
 
-    Windows_virtio.install_linux_tools g inspect;
-
     unconfigure_xen ();
     unconfigure_vbox ();
     unconfigure_vmware ();
@@ -90,6 +88,8 @@ let convert (g : G.guestfs) inspect source output rcaps =
     unconfigure_kudzu ();
     unconfigure_prltools ();
 
+    install_linux_tools ();
+
     let kernel = configure_kernel () in
 
     if output#keep_serial_console then (
@@ -492,6 +492,9 @@ let convert (g : G.guestfs) inspect source output rcaps =
             msg
     )
 
+  and install_linux_tools () =
+    Windows_virtio.install_linux_tools g inspect
+
   and configure_kernel () =
     (* Previously this function would try to install kernels, but we
      * don't do that any longer.
-- 
2.21.0