| commit | 647536359f8ea63330805cb77abbf2f101952daa | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Apr 27 00:18:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 27 00:18:26 2012 -0700 |
| tree | 9dce7e049769aa824deff68534a83cdc56c967d6 | |
| parent | 9c1c205931311d576442b5025391d851b22afccb [diff] | |
| parent | a02ff986fc0fe5543bb2168814eee04eac8ef579 [diff] |
am a02ff986: Merge "init: Add noexec mount option" * commit 'a02ff986fc0fe5543bb2168814eee04eac8ef579': init: Add noexec mount option
diff --git a/init/builtins.c b/init/builtins.c index 9aa2345..ad52b19 100644 --- a/init/builtins.c +++ b/init/builtins.c
@@ -273,6 +273,7 @@ unsigned flag; } mount_flags[] = { { "noatime", MS_NOATIME }, + { "noexec", MS_NOEXEC }, { "nosuid", MS_NOSUID }, { "nodev", MS_NODEV }, { "nodiratime", MS_NODIRATIME },