commit 83e670e6871046f4c0bb19a28d82f811a163938f
author Paul Crowley <paulcrowley@google.com> Thu May 21 22:12:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 21 22:12:58 2015 +0000
tree 9bd76e6da063780f0ba71a3776895aae9856741b
parent 1ee93af1336c323f216d536a6d9bb472026e7ff4
parent e8cbb421cd28ec754923a88a919557ee5b174411

am e8cbb421: am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init."

* commit 'e8cbb421cd28ec754923a88a919557ee5b174411':
  Set up crypto for user directories in init.

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 17d7b99..9989a24 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -321,6 +321,9 @@
     mkdir /data/system/heapdump 0700 system system
     mkdir /data/user 0711 system system
 
+    # Set up the crypto policies on /data/user
+    exec -- /system/bin/vdc cryptfs setusercryptopolicies /data/user
+
     # Reload policy from /data/security if present.
     setprop selinux.reload_policy 1