summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-05-22 19:19:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-22 19:19:14 +0000
commit7c7895755cf23140f08b7416ceff006dbbf7a411 (patch)
tree6029a88a7540e75b4b4cc260cd986d2908e1d1ab
parent0211d36054b7390dfedd2485893e2dacaf7052da (diff)
parent2e24bcfdce030d410cbc8e8c8fa3e8c1260ba65d (diff)
downloadsystem_core-7c7895755cf23140f08b7416ceff006dbbf7a411.tar.gz
system_core-7c7895755cf23140f08b7416ceff006dbbf7a411.tar.bz2
system_core-7c7895755cf23140f08b7416ceff006dbbf7a411.zip
Merge "Revert "Set up crypto for user directories in init.""
-rw-r--r--rootdir/init.rc4
1 files changed, 0 insertions, 4 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 436465afe..9fe1b4f1f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -265,7 +265,6 @@ on post-fs-data
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 @@ on post-fs-data
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