summaryrefslogtreecommitdiffstats
path: root/rootdir/init.rc
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-04-02 14:49:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-02 14:49:25 +0000
commitb8bd76b7cbfbc4b0d3b7d76070c9b53eec87c83a (patch)
tree521166390a106133b8d210038ab89d5b32b07f07 /rootdir/init.rc
parent4761c2a0e506c0c4389d4acfeb8a6d8f0d941718 (diff)
parentc410b3bd63828730623b9c5ccf15242175ac3c10 (diff)
downloadsystem_core-b8bd76b7cbfbc4b0d3b7d76070c9b53eec87c83a.zip
system_core-b8bd76b7cbfbc4b0d3b7d76070c9b53eec87c83a.tar.gz
system_core-b8bd76b7cbfbc4b0d3b7d76070c9b53eec87c83a.tar.bz2
Merge "Revert "Revert "Adding e4crypt support"""
Diffstat (limited to 'rootdir/init.rc')
-rw-r--r--rootdir/init.rc11
1 files changed, 11 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 219a353..3da6cc7 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
@@ -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