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

This commit is contained in:
Paul Crowley 2015-05-21 21:34:11 +00:00 committed by Gerrit Code Review
commit 7f623decf3

View file

@ -265,6 +265,7 @@ on post-fs-data
chmod 0660 /data/misc/wifi/wpa_supplicant.conf chmod 0660 /data/misc/wifi/wpa_supplicant.conf
mkdir /data/local 0751 root root mkdir /data/local 0751 root root
mkdir /data/misc/media 0700 media media mkdir /data/misc/media 0700 media media
mkdir /data/misc/vold 0700 root root
# For security reasons, /data/local/tmp should always be empty. # For security reasons, /data/local/tmp should always be empty.
# Do not place files or directories in /data/local/tmp # Do not place files or directories in /data/local/tmp
@ -314,6 +315,9 @@ on post-fs-data
mkdir /data/system/heapdump 0700 system system mkdir /data/system/heapdump 0700 system system
mkdir /data/user 0711 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. # Reload policy from /data/security if present.
setprop selinux.reload_policy 1 setprop selinux.reload_policy 1