From 9279749b84cc87c7830280b7895a48bed03c9429 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 24 Oct 2010 18:40:44 +0200 Subject: 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(). --- src/umount.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/umount.c b/src/umount.c index ca4dbc2362..0081d979d9 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; -- cgit v1.2.3-54-g00ecf