Merge "Create a new location for /data policy files" into jb-mr2-dev

This commit is contained in:
Geremy Condra 2013-03-21 21:45:39 +00:00 committed by Android (Google) Code Review
commit 9feea559d6
2 changed files with 4 additions and 0 deletions

View file

@ -745,6 +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/system/property_contexts" },
{ SELABEL_OPT_PATH, "/property_contexts" },
{ 0, NULL }

View file

@ -246,6 +246,9 @@ on post-fs-data
# symlink to bugreport storage location
symlink /data/data/com.android.shell/files/bugreports /data/bugreports
# 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.