[Libguestfs] [PATCH virt-v2v v3 2/2] -o rhv: Wait for the NBD server to exit to avoid a race with unmounting

[Richard W.M. Jones]

https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
---
 output/output_rhv.ml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/output/output_rhv.ml b/output/output_rhv.ml
index 15a2c14adf..45f831e39a 100644
--- a/output/output_rhv.ml
+++ b/output/output_rhv.ml
@@ -175,7 +175,14 @@ module RHV = struct
               chmod filename 0o666
           )
         in
-        output_to_local_file ~changeuid
+
+        (* We have to wait for the NBD server to exit rather than just
+         * killing it, otherwise it races with unmounting.  See:
+         * https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
+         *)
+        let on_exit_kill = Output.KillAndWait in
+
+        output_to_local_file ~changeuid ~on_exit_kill
           output_alloc output_format filename size socket
     ) (List.combine disks filenames);
 
-- 
2.37.0.rc2