X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fumount.c;fp=src%2Fumount.c;h=20db612ace8d11e2eea2e6796ade9c4a29212b6f;hb=6f7f51f793e5f2a5d42e05e3f1e3101f49d37299;hp=290e6cad02e7b7875d784ca3f02c6b6e6ac88ff8;hpb=0415a104366b93418fcedb076a962c632d9dd2ab;p=elogind.git

diff --git a/src/umount.c b/src/umount.c
index 290e6cad0..20db612ac 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -552,6 +552,8 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) {
 
 int umount_all(bool *changed) {
         int r;
+        bool umount_changed;
+
         LIST_HEAD(MountPoint, mp_list_head);
 
         LIST_HEAD_INIT(MountPoint, mp_list_head);
@@ -560,7 +562,13 @@ int umount_all(bool *changed) {
         if (r < 0)
                 goto end;
 
-        r = mount_points_list_umount(&mp_list_head, changed);
+        /* retry umount, until nothing can be umounted anymore */
+        do {
+                umount_changed = false;
+                r = mount_points_list_umount(&mp_list_head, &umount_changed);
+                if (umount_changed)
+                        *changed = true;
+        } while(umount_changed);
         if (r <= 0)
                 goto end;