diff options
| author | Geremy Condra <gcondra@google.com> | 2013-03-21 05:40:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-21 05:40:26 +0000 |
| commit | 028e38f691c12c3f6f034dd192e5efcae8e767c7 (patch) | |
| tree | e37f67de4b6f35943c7633279a70acd56ff6fe27 | |
| parent | 55e1df471bb6e786c46a64d7ea99e224a6c46af2 (diff) | |
| parent | 46e1bd89b457713bf91d2dc751795822cc202658 (diff) | |
| download | system_core-028e38f691c12c3f6f034dd192e5efcae8e767c7.zip system_core-028e38f691c12c3f6f034dd192e5efcae8e767c7.tar.gz system_core-028e38f691c12c3f6f034dd192e5efcae8e767c7.tar.bz2 | |
Merge "Create a new location for /data policy files"
| -rwxr-xr-x | init/init.c | 1 | ||||
| -rw-r--r-- | rootdir/init.rc | 3 |
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 d6182e8..72f351f 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -242,6 +242,9 @@ on post-fs-data # 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. |