commit 2e24bcfdce030d410cbc8e8c8fa3e8c1260ba65d
author Paul Lawrence <paullawrence@google.com> Fri May 22 18:31:55 2015 +0000
committer Paul Lawrence <paullawrence@google.com> Fri May 22 18:32:45 2015 +0000
tree 535cf47381bed616132e5b0b38fcfee84a448717
parent ce6f7160969e67c9caa486a6f249ab3e997c5f4c

Revert "Set up crypto for user directories in init."

Causes a boot loop in Shamu

This reverts commit ce6f7160969e67c9caa486a6f249ab3e997c5f4c.

Bug: 21396871
Change-Id: I9709053c589807d4530a3a99bd84e5b3177316cd

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 436465a..9fe1b4f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -265,7 +265,6 @@
     chmod 0660 /data/misc/wifi/wpa_supplicant.conf
     mkdir /data/local 0751 root root
     mkdir /data/misc/media 0700 media media
-    mkdir /data/misc/vold 0700 root root
 
     # For security reasons, /data/local/tmp should always be empty.
     # Do not place files or directories in /data/local/tmp
@@ -315,9 +314,6 @@
     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