summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-02-25 15:09:39 -0800
committerPaul Lawrence <paullawrence@google.com>2015-03-23 14:16:43 -0700
commit6095afc115fe3a4b7d151b4fcc164e00f9df9659 (patch)
treeae19174fa1de356704a00d8dbbd91db99ea4a398 /rootdir
parent631945200e6442421e736c05b5e1df469752faf8 (diff)
downloadsystem_core-6095afc115fe3a4b7d151b4fcc164e00f9df9659.zip
system_core-6095afc115fe3a4b7d151b4fcc164e00f9df9659.tar.gz
system_core-6095afc115fe3a4b7d151b4fcc164e00f9df9659.tar.bz2
Adding e4crypt support
Add file encryption flag to fstab. If file encryption flag set in fstab, handle identically to block encrypted volumes. Requires matching change: https://googleplex-android-review.git.corp.google.com/#/c/642778/ Change-Id: I28c236959f2d7d5f0dccc8ea45c325ea0cf871fc
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc11
1 files changed, 11 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 2ff0d04..90b0b69 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -231,6 +231,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
@@ -309,6 +311,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
@@ -444,6 +454,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