commit 90b80de5a7b9b4557985eb2ec21d2d82b44eb83b
author Jeff Sharkey <jsharkey@android.com> Tue Aug 14 14:17:45 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 14 14:17:45 2012 -0700
tree 4bc4f640777d207076c82f5c0c2cb27aea1054fb
parent 96539e8153dadeccb8b7d334cda8b2acaaa68f06
parent e50ac5f7771872331df70251d23d6bd8155da4a7

Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 60aed42..538b5be 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -58,6 +58,12 @@
     { "ro",         MS_RDONLY },
     { "rw",         0 },
     { "remount",    MS_REMOUNT },
+    { "bind",       MS_BIND },
+    { "rec",        MS_REC },
+    { "unbindable", MS_UNBINDABLE },
+    { "private",    MS_PRIVATE },
+    { "slave",      MS_SLAVE },
+    { "shared",     MS_SHARED },
     { "defaults",   0 },
     { 0,            0 },
 };

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index 5bda7a0..da41b89 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -339,6 +339,12 @@
     { "ro",         MS_RDONLY },
     { "rw",         0 },
     { "remount",    MS_REMOUNT },
+    { "bind",       MS_BIND },
+    { "rec",        MS_REC },
+    { "unbindable", MS_UNBINDABLE },
+    { "private",    MS_PRIVATE },
+    { "slave",      MS_SLAVE },
+    { "shared",     MS_SHARED },
     { "defaults",   0 },
     { 0,            0 },
 };