diff options
| author | Geremy Condra <gcondra@google.com> | 2013-04-15 21:34:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 21:34:07 +0000 |
| commit | dbdd280ea6189d40edec07e886712e60f0dbae18 (patch) | |
| tree | 484fac316840cee620133b5411926527393d8f4b /init | |
| parent | 000f5cf7c6874034bf5ef6dda98533e80dd4d628 (diff) | |
| parent | 47677a506febfe386d186f8f854d967f165a342f (diff) | |
| download | system_core-dbdd280ea6189d40edec07e886712e60f0dbae18.zip system_core-dbdd280ea6189d40edec07e886712e60f0dbae18.tar.gz system_core-dbdd280ea6189d40edec07e886712e60f0dbae18.tar.bz2 | |
Merge "Add logic to fixup file contexts after a policy update."
Diffstat (limited to 'init')
| -rwxr-xr-x | init/init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c index f8b21e6..3e67192 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/property_contexts" }, + { SELABEL_OPT_PATH, "/data/security/current/property_contexts" }, { SELABEL_OPT_PATH, "/property_contexts" }, { 0, NULL } }; @@ -793,6 +793,11 @@ 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; } |