summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-24 03:10:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-24 03:10:16 +0000
commitd46567848bfcdc8f2cbc3faeef487cf5c770b43a (patch)
tree91578fac2ea04ddfa806376d471b2aa5fa202b67 /rootdir
parent765207524fcbe261686c5d96bc42ea3dcc124f0a (diff)
parentadf0d1bbfa4bc560c2106f14afa8258a11c48bf6 (diff)
downloadsystem_core-d46567848bfcdc8f2cbc3faeef487cf5c770b43a.zip
system_core-d46567848bfcdc8f2cbc3faeef487cf5c770b43a.tar.gz
system_core-d46567848bfcdc8f2cbc3faeef487cf5c770b43a.tar.bz2
Merge "Make init re-exec itself for its SELinux domain transition."
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc7
1 files changed, 0 insertions, 7 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index d3c562f..c00c590 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -14,13 +14,6 @@ on early-init
# Set init and its forked children's oom_adj.
write /proc/1/oom_score_adj -1000
- # Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
- write /sys/fs/selinux/checkreqprot 0
-
- # Set the security context for the init process.
- # This should occur before anything else (e.g. ueventd) is started.
- setcon u:r:init:s0
-
# Set the security context of /adb_keys if present.
restorecon /adb_keys