To partially avoid a potential race against nbdkit or qemu-nbd
releasing files on the mountpoint before they exit, unmount as late as
we can.
See also
https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
---
output/output_rhv.ml | 4 ++--
common | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/output/output_rhv.ml b/output/output_rhv.ml
index 8571e07b0c..b3f03db760 100644
--- a/output/output_rhv.ml
+++ b/output/output_rhv.ml
@@ -204,8 +204,8 @@ module RHV = struct
if run_command cmd <> 0 then
error (f_"mount command failed, see earlier errors.\n\nThis probably means
you didn't specify the right %s path [-os %s], or else you need to rerun virt-v2v as
root.") domain_class os;
- (* Make sure it is unmounted at exit. *)
- On_exit.f (
+ (* Make sure it is unmounted at exit, as late as possible (prio=0) *)
+ On_exit.f ~prio:0 (
fun () ->
let cmd = [ "umount"; mp ] in
ignore (run_command cmd);
diff --git a/common b/common
index c4c7d917b8..a2446619e2 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c4c7d917b89295ee26d1c276d9426f905b474227
+Subproject commit a2446619e2ad668edbaab1decc999c518ae24615
--
2.37.0.rc2