commit a3c3709ead0505f1c872bbf3a42999deb727e2ff
author Geremy Condra <gcondra@google.com> Wed Mar 20 23:45:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 20 23:45:15 2013 -0700
tree 60e350e978780109b8f603b4808d8eb12a87d2d8
parent 2690482a35562fc2f5c8a2164f10ffba1d27e599
parent 028e38f691c12c3f6f034dd192e5efcae8e767c7

am 028e38f6: Merge "Create a new location for /data policy files"

* commit '028e38f691c12c3f6f034dd192e5efcae8e767c7':
  Create a new location for /data policy files

init/init.c

diff --git a/init/init.c b/init/init.c
index bfaf983..ede2daa 100755
--- a/init/init.c
+++ b/init/init.c
@@ -745,6 +745,7 @@
 #endif
 
 static const struct selinux_opt seopts_prop[] = {
+        { SELABEL_OPT_PATH, "/data/security/property_contexts" },
         { SELABEL_OPT_PATH, "/data/system/property_contexts" },
         { SELABEL_OPT_PATH, "/property_contexts" },
         { 0, NULL }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index d6182e8..72f351f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -242,6 +242,9 @@
     # the following directory.
     mkdir /data/drm 0770 drm drm
 
+    # Separate location for storing security policy files on data
+    mkdir /data/security 0600 system system
+
     # If there is no fs-post-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems
     # won't work.