diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-22 18:21:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-22 18:21:03 -0700 |
| commit | ad8663e970e218bf2f8c202e425d25dffe95b588 (patch) | |
| tree | e0600397fff7bdd5df728f77a120c02693693435 /toolbox | |
| parent | 35aa3642e1d4c6206750d5b51519d7de352a80e2 (diff) | |
| parent | 08f748a2f8e6933fdd96290de049c1aa1f3f8479 (diff) | |
| download | system_core-ad8663e970e218bf2f8c202e425d25dffe95b588.zip system_core-ad8663e970e218bf2f8c202e425d25dffe95b588.tar.gz system_core-ad8663e970e218bf2f8c202e425d25dffe95b588.tar.bz2 | |
am 08f748a2: am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev
* commit '08f748a2f8e6933fdd96290de049c1aa1f3f8479':
Iteration on multi-user external storage.
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/mount.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/toolbox/mount.c b/toolbox/mount.c index 27cf3c9..b7adce2 100644 --- a/toolbox/mount.c +++ b/toolbox/mount.c @@ -49,12 +49,17 @@ static const struct mount_opts options[] = { { "exec", MS_NOEXEC, 0, MS_NOEXEC }, { "move", MS_TYPE, MS_MOVE, 0 }, { "recurse", MS_REC, MS_REC, 0 }, + { "rec", MS_REC, MS_REC, 0 }, { "remount", MS_TYPE, MS_REMOUNT, 0 }, { "ro", MS_RDONLY, MS_RDONLY, 0 }, { "rw", MS_RDONLY, 0, MS_RDONLY }, { "suid", MS_NOSUID, 0, MS_NOSUID }, { "sync", MS_SYNCHRONOUS, MS_SYNCHRONOUS, 0 }, { "verbose", MS_VERBOSE, MS_VERBOSE, 0 }, + { "unbindable", MS_UNBINDABLE, MS_UNBINDABLE, 0 }, + { "private", MS_PRIVATE, MS_PRIVATE, 0 }, + { "slave", MS_SLAVE, MS_SLAVE, 0 }, + { "shared", MS_SHARED, MS_SHARED, 0 }, }; static void add_extra_option(struct extra_opts *extra, char *s) |