Revert "guest_prepare_disk: Only do the umount if we set an env var"

This reverts commit ea6626f7edd9eb40a3510eaf6816a77cac4f63d0.

Contrary to the assertions in the commit message, this unmount etc. is
actually used by some tests.  So removing it breaks things.

Now, we have a different workaround: a 10s sleep before we attempt the
umount.  The combination of
  ea6626f7 guest_prepare_disk: Only do the umount if we set an env var
  1d3a97b0 xl guest creation: Pause 10s to work around libxl/blkback races
  3a208c18 all guest creation: Pause 10s to work around libxl/blkback races
and this revert is simply this:

  @@ -1938,6 +1938,8 @@ sub guest_create_paused ($) {
   sub guest_prepare_disk ($) {
       my ($gho) = @_;

  +    sleep(10);
  +
       guest_umount_lv($gho->{Host}, $gho);

       return if ($gho->{Diskfmt} // 'none') eq "none";

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index f2baa7c26df911c074295b70d0e0c12adb38eaeb..44f01a86e1570730a0bcc2dbf7d3589ea4ea561e 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1940,8 +1940,7 @@ sub guest_prepare_disk ($) {
 
     sleep(10);
 
-    guest_umount_lv($gho->{Host}, $gho)
-       if $ENV{'OSSTEST_GUEST_DISK_MOUNT_CLEANUP'};
+    guest_umount_lv($gho->{Host}, $gho);
 
     return if ($gho->{Diskfmt} // 'none') eq "none";