helpers/mount: Check for failed umounts only umounting the whole list

Otherwise we raise bogus RuntimeErrors on paths with multiple mount points,
which may be desired - for example when using overlayfs.

diff --git a/tools/helpers/mount.py b/tools/helpers/mount.py
index fdf647776b3412781757c3388da26b4b6bd7063c..fce103567648072646289a045fd28548d6f0434d 100644 (file)
--- a/tools/helpers/mount.py
+++ b/tools/helpers/mount.py
@@ -102,8 +102,10 @@ def umount_all(args, folder):
     """
     Umount all folders, that are mounted inside a given folder.
     """
     """
     Umount all folders, that are mounted inside a given folder.
     """

-    for mountpoint in umount_all_list(folder):
+    all_list = umount_all_list(folder)
+    for mountpoint in all_list:

         tools.helpers.run.user(args, ["umount", mountpoint])
         tools.helpers.run.user(args, ["umount", mountpoint])

+    for mountpoint in all_list:

         if ismount(mountpoint):
             raise RuntimeError("Failed to umount: " + mountpoint)
 
         if ismount(mountpoint):
             raise RuntimeError("Failed to umount: " + mountpoint)