[systemd-commits] src/umount.c

[Lennart Poettering]

 src/umount.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9279749b84cc87c7830280b7895a48bed03c9429
Author: Michael Biebl <biebl at debian.org>
Date:   Sun Oct 24 18:40:44 2010 +0200

    umount: Make sure / is remounted ro on shutdown
    
    Increment n_failed in mount_points_list_umount() if we skip /.
    Otherwise it can happen that mount_points_list_remount_read_only() is
    not called in umount_all().

diff --git a/src/umount.c b/src/umount.c
index ca4dbc2..0081d97 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -400,12 +400,13 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
         assert(head);
 
         LIST_FOREACH_SAFE(mount_point, m, n, *head) {
-                if (streq(m->path, "/"))
+                if (streq(m->path, "/")) {
+                        n_failed++;
                         continue;
+                }
 
                 /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
                 if (umount2(m->path, MNT_FORCE) == 0) {
-
                         if (changed)
                                 *changed = true;