From 4660f35884893fd69a0b1379c0af687d1e9eda66 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Wed, 2 Nov 2022 19:08:07 +0100 Subject: [PATCH] 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. --- tools/helpers/mount.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/helpers/mount.py b/tools/helpers/mount.py index fdf6477..fce1035 100644 --- 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. """ - 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]) + for mountpoint in all_list: if ismount(mountpoint): raise RuntimeError("Failed to umount: " + mountpoint) -- 2.47.3