From: Michael Biebl <biebl@debian.org>
Date: Sun, 24 Oct 2010 16:40:44 +0000 (+0200)
Subject: umount: Make sure / is remounted ro on shutdown
X-Git-Tag: v12~166
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9279749b84cc87c7830280b7895a48bed03c9429;hp=274914f99191e466bc523eadba74f52db8433189;ds=sidebyside

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 ca4dbc236..0081d979d 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;