commit ca01bbc7c6537c6b273dae3541f4ae886ec1dc2c
author Daniel Rosenberg <drosen@google.com> Tue Aug 04 00:50:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 04 00:50:40 2015 +0000
tree b3445289ea06bde32ac180d4354935d96aca3bda
parent b4ef92374caf0e878d8f6a54005a4adc4fc0f666
parent bafed52c3b06b8d84ffcb9f4c342bdb052813496

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

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index f467f81..459daec 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -524,6 +524,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") ||