aboutsummaryrefslogtreecommitdiffstats
path: root/toolbox/mount.c
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-08-22 13:57:25 -0700
committerJeff Sharkey <jsharkey@android.com>2012-08-22 14:28:37 -0700
commitbfcd810b792f7ffbb2ec1360c0c2662725fd0362 (patch)
tree7266cdc116a944dc9ff7654547dec15d10ebb899 /toolbox/mount.c
parent6302b420554724c1434e27e2cd46cb43f5fb7bca (diff)
downloadsystem_core-bfcd810b792f7ffbb2ec1360c0c2662725fd0362.tar.gz
system_core-bfcd810b792f7ffbb2ec1360c0c2662725fd0362.tar.bz2
system_core-bfcd810b792f7ffbb2ec1360c0c2662725fd0362.zip
Iteration on multi-user external storage.
Define /storage as top-level concept, so that we enforce permissions uniformly. Moves external storage paths from headers to per-device environment variables. Added missing mount flags, and we no longer have adb-specific external storage. Bug: 6925012 Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
Diffstat (limited to 'toolbox/mount.c')
-rw-r--r--toolbox/mount.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/toolbox/mount.c b/toolbox/mount.c
index 27cf3c9a..b7adce2d 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)