diff options
author | repo sync | 2013-04-26 15:31:21 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2013-04-26 15:31:21 -0500 |
commit | 538b5d4e8e4c480b2120aa957fe3e11a2836a1b3 (patch) | |
tree | 20b7da047484aa8f37c10156a29c51e103e49b3c | |
parent | 131ee07b77e0250c16cebe2b0e226c5bff8e9587 (diff) | |
parent | b89bdfde422eff751b3f939f10ab57e22af83eaa (diff) | |
download | platform-system-core-538b5d4e8e4c480b2120aa957fe3e11a2836a1b3.tar.gz platform-system-core-538b5d4e8e4c480b2120aa957fe3e11a2836a1b3.tar.xz platform-system-core-538b5d4e8e4c480b2120aa957fe3e11a2836a1b3.zip |
Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
-rwxr-xr-x | init/property_service.c | 1 | ||||
-rw-r--r-- | rootdir/init.rc | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/init/property_service.c b/init/property_service.c index 578000154..324839977 100755 --- a/init/property_service.c +++ b/init/property_service.c | |||
@@ -91,6 +91,7 @@ struct { | |||
91 | { "persist.service.", AID_SYSTEM, 0 }, | 91 | { "persist.service.", AID_SYSTEM, 0 }, |
92 | { "persist.security.", AID_SYSTEM, 0 }, | 92 | { "persist.security.", AID_SYSTEM, 0 }, |
93 | { "persist.service.bdroid.", AID_BLUETOOTH, 0 }, | 93 | { "persist.service.bdroid.", AID_BLUETOOTH, 0 }, |
94 | { "persist.selinux.enforcing", AID_SYSTEM, 0}, | ||
94 | { "selinux." , AID_SYSTEM, 0 }, | 95 | { "selinux." , AID_SYSTEM, 0 }, |
95 | { NULL, 0, 0 } | 96 | { NULL, 0, 0 } |
96 | }; | 97 | }; |
diff --git a/rootdir/init.rc b/rootdir/init.rc index f7fe6f3f3..854af445d 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc | |||
@@ -413,6 +413,12 @@ on property:selinux.reload_policy=1 | |||
413 | restart ueventd | 413 | restart ueventd |
414 | restart installd | 414 | restart installd |
415 | 415 | ||
416 | on property:persist.selinux.enforcing=1 | ||
417 | setenforce 1 | ||
418 | |||
419 | on property:persist.selinux.enforcing=0 | ||
420 | setenforce 0 | ||
421 | |||
416 | service console /system/bin/sh | 422 | service console /system/bin/sh |
417 | class core | 423 | class core |
418 | console | 424 | console |