diff options
| author | gcondra@google.com <gcondra@google.com> | 2013-05-20 16:35:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-20 16:35:35 -0700 |
| commit | a022ce7c80872957e3e54faaedcd2d8f0a144f5a (patch) | |
| tree | fa8b07bf1735505b12d3db8fd86a513887fd062f /init | |
| parent | 1e47a7466868ff90f6afa2d20d1b209b7b8fcfae (diff) | |
| parent | 8f6adcfcc55414cc07c18fe47d7c4314da148544 (diff) | |
| download | system_core-a022ce7c80872957e3e54faaedcd2d8f0a144f5a.zip system_core-a022ce7c80872957e3e54faaedcd2d8f0a144f5a.tar.gz system_core-a022ce7c80872957e3e54faaedcd2d8f0a144f5a.tar.bz2 | |
am 8f6adcfc: am 49be2407: Revert "Add logic to fixup file contexts after a policy update."
* commit '8f6adcfcc55414cc07c18fe47d7c4314da148544':
Revert "Add logic to fixup file contexts after a policy update."
Diffstat (limited to 'init')
| -rwxr-xr-x | init/init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/init/init.c b/init/init.c index 3e67192..f8b21e6 100755 --- a/init/init.c +++ b/init/init.c @@ -745,7 +745,7 @@ static int bootchart_init_action(int nargs, char **args) #endif static const struct selinux_opt seopts_prop[] = { - { SELABEL_OPT_PATH, "/data/security/current/property_contexts" }, + { SELABEL_OPT_PATH, "/data/security/property_contexts" }, { SELABEL_OPT_PATH, "/property_contexts" }, { 0, NULL } }; @@ -793,11 +793,6 @@ int selinux_reload_policy(void) selabel_close(sehandle_prop); selinux_init_all_handles(); - - selinux_android_fixcon("/data"); - selinux_android_fixcon("/system"); - selinux_android_fixcon("/dev"); - return 0; } |