summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-10-24 18:40:44 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-25 21:51:57 +0200
commit9279749b84cc87c7830280b7895a48bed03c9429 (patch)
tree3152da00f1da1e1089db801786507302a2f64a2d
parent274914f99191e466bc523eadba74f52db8433189 (diff)
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().
-rw-r--r--src/umount.c5
1 files 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;