summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-03-15 16:52:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-15 16:52:40 +0000
commit5e088596dc6f007e6c58a2a15d92040016ec6dd4 (patch)
tree30528959210174f573bcdb048c985e40f10a1d18
parent8ee047369e8095810d720b417f8f685f58534531 (diff)
parent285c2ae04aaf77e6036d4bbf784e8395c6f07347 (diff)
downloadsystem_core-5e088596dc6f007e6c58a2a15d92040016ec6dd4.zip
system_core-5e088596dc6f007e6c58a2a15d92040016ec6dd4.tar.gz
system_core-5e088596dc6f007e6c58a2a15d92040016ec6dd4.tar.bz2
am 285c2ae0: Merge "Document the mount option string in the readme.txt"
* commit '285c2ae04aaf77e6036d4bbf784e8395c6f07347': Document the mount option string in the readme.txt
-rw-r--r--init/readme.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/init/readme.txt b/init/readme.txt
index d2933b9..66b4a4f 100644
--- a/init/readme.txt
+++ b/init/readme.txt
@@ -207,11 +207,13 @@ mkdir <path> [mode] [owner] [group]
group. If not provided, the directory is created with permissions 755 and
owned by the root user and root group.
-mount <type> <device> <dir> [ <mountoption> ]*
+mount <type> <device> <dir> [ <flag> ]* [<options>]
Attempt to mount the named device at the directory <dir>
<device> may be of the form mtd@name to specify a mtd block
device by name.
- <mountoption>s include "ro", "rw", "remount", "noatime", ...
+ <flag>s include "ro", "rw", "remount", "noatime", ...
+ <options> include "barrier=1", "noauto_da_alloc", "discard", ... as
+ a comma separated string, eg: barrier=1,noauto_da_alloc
restorecon <path> [ <path> ]*
Restore the file named by <path> to the security context specified