commit 47677a506febfe386d186f8f854d967f165a342f
author Geremy Condra <gcondra@google.com> Wed Apr 10 17:51:53 2013 -0700
committer Geremy Condra <gcondra@google.com> Mon Apr 15 13:16:38 2013 -0700
tree f03eebcd6b06275e1949091d37b0bf5a6cde6dc1
parent bf6c100a8c06ec3a50669ab4d9d8c9419ca8b2e8

Add logic to fixup file contexts after a policy update.

Bug: 8116902
Change-Id: Ifa1785c75a24a9b3cfcb700f22ded7d16a917f79

init/init.c

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 @@
 #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 @@
         selabel_close(sehandle_prop);
 
     selinux_init_all_handles();
+
+    selinux_android_fixcon("/data");
+    selinux_android_fixcon("/system");
+    selinux_android_fixcon("/dev");
+
     return 0;
 }