summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Roberts <w.roberts@sta.samsung.com>2013-01-23 14:05:04 -0800
committerGeremy Condra <gcondra@google.com>2013-03-21 14:26:12 -0700
commitbfd71b489b283fe54669dc5d1ccdc97b453d2fb4 (patch)
tree27f300ffc2b97dde8fda665a837e0088c26f640d
parent7bce39cac65166f39d0f26453da6e59e236d2ab5 (diff)
downloadsystem_core-bfd71b489b283fe54669dc5d1ccdc97b453d2fb4.zip
system_core-bfd71b489b283fe54669dc5d1ccdc97b453d2fb4.tar.gz
system_core-bfd71b489b283fe54669dc5d1ccdc97b453d2fb4.tar.bz2
Create a new location for /data policy files
Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
-rwxr-xr-xinit/init.c1
-rw-r--r--rootdir/init.rc3
2 files changed, 4 insertions, 0 deletions
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 @@ 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 }
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 257407a..55ee03d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -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.