commit 9b55c2398cc36950947930b65b9f5bc1a26f210c
author Daniel Rosenberg <drosen@google.com> Mon Jun 29 17:33:05 2015 -0700
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 08:53:04 2015 -0800
tree f47361959932ac0ed75c7d68cf1c4259329de503
parent 8ad47f824a08214da6a5b60f49887974e26b0a41

Skip mounting /, just mark block device as ro if needed.

Change-Id: I7fbb636d296abc1caab6c7bf88017684c9df7759

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 15d44ef..391b4db 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -523,6 +523,14 @@
             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") ||