diff options
| author | gcondra@google.com <gcondra@google.com> | 2013-05-20 15:52:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-20 15:52:28 -0700 |
| commit | 8f6adcfcc55414cc07c18fe47d7c4314da148544 (patch) | |
| tree | 20fded8027384b6455080b9271da169e0b8417b9 | |
| parent | 253e91b4ffb631b188fdac0c1624786103471f05 (diff) | |
| parent | 49be240735a06f44e1d91aa51dd299779ad36d96 (diff) | |
| download | system_core-8f6adcfcc55414cc07c18fe47d7c4314da148544.zip system_core-8f6adcfcc55414cc07c18fe47d7c4314da148544.tar.gz system_core-8f6adcfcc55414cc07c18fe47d7c4314da148544.tar.bz2 | |
am 49be2407: Revert "Add logic to fixup file contexts after a policy update."
* commit '49be240735a06f44e1d91aa51dd299779ad36d96':
Revert "Add logic to fixup file contexts after a policy update."
| -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; } |