From 31a4fafc156ea4ac7f66d583add0919b5598f248 Mon Sep 17 00:00:00 2001
From: Daniel Rosenberg <drosen@google.com>
Date: Mon, 29 Jun 2015 17:33:05 -0700
Subject: Skip mounting /, just mark block device as ro if needed.

Change-Id: I7fbb636d296abc1caab6c7bf88017684c9df7759
---
 fs_mgr/fs_mgr.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'fs_mgr')

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index f467f81cf..459daecf2 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -524,6 +524,14 @@ int fs_mgr_mount_all(struct fstab *fstab)
             continue;
         }
 
+        /* Skip mounting the root partition, as it will already have been mounted */
+        if (!strcmp(fstab->recs[i].mount_point, "/")) {
+            if ((fstab->recs[i].fs_mgr_flags & MS_RDONLY) != 0) {
+                fs_mgr_set_blk_ro(fstab->recs[i].blk_device);
+            }
+            continue;
+        }
+
         /* Translate LABEL= file system labels into block devices */
         if (!strcmp(fstab->recs[i].fs_type, "ext2") ||
             !strcmp(fstab->recs[i].fs_type, "ext3") ||
-- 
cgit v1.2.3