aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-04-27 00:21:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-27 00:21:22 -0700
commitcf41769375f34dbf17de52df02e4881ecfee0c8b (patch)
treef110e4ff83d85f9582d11cf6344d651e2f4afe7f /init
parente860d239529a484021d779d391c823ca93323ae1 (diff)
parent647536359f8ea63330805cb77abbf2f101952daa (diff)
downloadsystem_core-cf41769375f34dbf17de52df02e4881ecfee0c8b.tar.gz
system_core-cf41769375f34dbf17de52df02e4881ecfee0c8b.tar.bz2
system_core-cf41769375f34dbf17de52df02e4881ecfee0c8b.zip
am 64753635: am a02ff986: Merge "init: Add noexec mount option"
* commit '647536359f8ea63330805cb77abbf2f101952daa': init: Add noexec mount option
Diffstat (limited to 'init')
-rw-r--r--init/builtins.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/builtins.c b/init/builtins.c
index 0b9c0cfe..661c9b18 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -330,6 +330,7 @@ static struct {
unsigned flag;
} mount_flags[] = {
{ "noatime", MS_NOATIME },
+ { "noexec", MS_NOEXEC },
{ "nosuid", MS_NOSUID },
{ "nodev", MS_NODEV },
{ "nodiratime", MS_NODIRATIME },