X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fumount.c;h=4e036d82a30555988c18fea2c4dc8a8333f4b78c;hp=96ce61da8b1c7d8362b00df10889a0451a241e33;hb=cd0504d0a13d8297b97c9238fd1b94b4141c5aa8;hpb=f3accc08d36c3937f6bc2e696679610dd36fbfaf

diff --git a/src/umount.c b/src/umount.c
index 96ce61da8..4e036d82a 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -103,9 +103,7 @@ static int mount_points_list_get(MountPoint **head) {
 
                 /* If we encounter a bind mount, don't try to remount
                  * the source dir too early */
-                if (!streq(root, "/"))
-                        skip_ro = true;
-
+                skip_ro = !streq(root, "/");
                 free(root);
 
                 p = cunescape(path);
@@ -148,7 +146,7 @@ static int swap_list_get(MountPoint **head) {
         assert(head);
 
         if (!(proc_swaps = fopen("/proc/swaps", "re")))
-                return -errno;
+                return (errno == ENOENT) ? 0 : -errno;
 
         (void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");
 
@@ -405,7 +403,7 @@ static int delete_dm(dev_t devnum) {
         return r >= 0 ? 0 : -errno;
 }
 
-static int mount_points_list_umount(MountPoint **head, bool *changed) {
+static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_error) {
         MountPoint *m, *n;
         int n_failed = 0;
 
@@ -419,11 +417,12 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
 
                 /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
                 if (umount2(m->path, MNT_FORCE) == 0) {
+                        log_info("Unmounted %s.", m->path);
                         if (changed)
                                 *changed = true;
 
                         mount_point_free(head, m);
-                } else {
+                } else if (log_error) {
                         log_warning("Could not unmount %s: %m", m->path);
                         n_failed++;
                 }
@@ -553,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);
@@ -561,7 +562,18 @@ 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;
+
+                mount_points_list_umount(&mp_list_head, &umount_changed, false);
+                if (umount_changed)
+                        *changed = true;
+
+        } while (umount_changed);
+
+        /* umount one more time with logging enabled */
+        r = mount_points_list_umount(&mp_list_head, &umount_changed, true);
         if (r <= 0)
                 goto end;