From f3accc08d36c3937f6bc2e696679610dd36fbfaf Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Mar 2011 02:41:11 +0100
Subject: [PATCH] umount: don't try to remount bind mounts ro during shutdown

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

diff --git a/src/umount.c b/src/umount.c
index 6fe0a26d..96ce61da 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -37,6 +37,7 @@
 typedef struct MountPoint {
         char *path;
         dev_t devnum;
+        bool skip_ro;
         LIST_FIELDS (struct MountPoint, mount_point);
 } MountPoint;
 
@@ -71,6 +72,8 @@ static int mount_points_list_get(MountPoint **head) {
         for (i = 1;; i++) {
                 int k;
                 MountPoint *m;
+                char *root;
+                bool skip_ro;
 
                 path = p = NULL;
 
@@ -78,7 +81,7 @@ static int mount_points_list_get(MountPoint **head) {
                                 "%*s "       /* (1) mount id */
                                 "%*s "       /* (2) parent id */
                                 "%*s "       /* (3) major:minor */
-                                "%*s "       /* (4) root */
+                                "%ms "       /* (4) root */
                                 "%ms "       /* (5) mount point */
                                 "%*s"        /* (6) mount options */
                                 "%*[^-]"     /* (7) optional fields */
@@ -87,7 +90,8 @@ static int mount_points_list_get(MountPoint **head) {
                                 "%*s"        /* (10) mount source */
                                 "%*s"        /* (11) mount options 2 */
                                 "%*[^\n]",   /* some rubbish at the end */
-                                &path)) != 1) {
+                                &root,
+                                &path)) != 2) {
                         if (k == EOF)
                                 break;
 
@@ -97,6 +101,13 @@ static int mount_points_list_get(MountPoint **head) {
                         continue;
                 }
 
+                /* If we encounter a bind mount, don't try to remount
+                 * the source dir too early */
+                if (!streq(root, "/"))
+                        skip_ro = true;
+
+                free(root);
+
                 p = cunescape(path);
                 free(path);
 
@@ -117,6 +128,7 @@ static int mount_points_list_get(MountPoint **head) {
                 }
 
                 m->path = p;
+                m->skip_ro = skip_ro;
                 LIST_PREPEND(MountPoint, mount_point, *head, m);
         }
 
@@ -428,6 +440,11 @@ static int mount_points_list_remount_read_only(MountPoint **head, bool *changed)
 
         LIST_FOREACH_SAFE(mount_point, m, n, *head) {
 
+                if (m->skip_ro) {
+                        n_failed++;
+                        continue;
+                }
+
                 /* Trying to remount read-only */
                 if (mount(NULL, m->path, NULL, MS_MGC_VAL|MS_REMOUNT|MS_RDONLY, NULL) == 0) {
                         if (changed)
-- 
2.39.5