diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-03-26 15:49:42 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-04-01 13:48:06 -0700 |
| commit | c410b3bd63828730623b9c5ccf15242175ac3c10 (patch) | |
| tree | 04a31be5983af40ef11c710a81f45812e5d492e5 /rootdir | |
| parent | fc0004894a3ff93382493688bb9ab9af83b74ea4 (diff) | |
| download | system_core-c410b3bd63828730623b9c5ccf15242175ac3c10.zip system_core-c410b3bd63828730623b9c5ccf15242175ac3c10.tar.gz system_core-c410b3bd63828730623b9c5ccf15242175ac3c10.tar.bz2 | |
Revert "Revert "Adding e4crypt support""
Fix build break caused by original change
This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5.
(cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c)
Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 9fad0ed..452758c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -227,6 +227,8 @@ on post-fs mkdir /cache/lost+found 0770 root root on post-fs-data + installkey /data + # We chown/chmod /data again so because mount is run as root + defaults chown system system /data chmod 0771 /data @@ -308,6 +310,14 @@ on post-fs-data # Separate location for storing security policy files on data mkdir /data/security 0711 system system + # Create all remaining /data root dirs so that they are made through init + # and get proper encryption policy installed + mkdir /data/backup 0700 system system + mkdir /data/media 0770 media_rw media_rw + mkdir /data/ss 0700 system system + mkdir /data/system 0775 system system + mkdir /data/user 0711 system system + # Reload policy from /data/security if present. setprop selinux.reload_policy 1 @@ -443,6 +453,7 @@ on property:vold.decrypt=trigger_restart_min_framework class_start main on property:vold.decrypt=trigger_restart_framework + installkey /data class_start main class_start late_start |