diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-04-27 20:08:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-27 20:08:53 +0000 |
| commit | 9234b169e62b10e38ecd3dc636ccccb425ea4eed (patch) | |
| tree | 3a02b204e967358c432da780014db9c65f8d8588 /rootdir | |
| parent | 96b6415c560fc59e7114fd6f455943765947eeb7 (diff) | |
| parent | 4bf1887c787a025aad2fbafe382e556e85ac73b0 (diff) | |
| download | core-9234b169e62b10e38ecd3dc636ccccb425ea4eed.tar.gz core-9234b169e62b10e38ecd3dc636ccccb425ea4eed.tar.bz2 core-9234b169e62b10e38ecd3dc636ccccb425ea4eed.zip | |
Merge "Securely encrypt the master key"
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index c00c590aa..3709b82db 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -220,14 +220,17 @@ 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 # We restorecon /data in case the userdata partition has been reset. restorecon /data + # Make sure we have the device encryption key + start logd + start vold + installkey /data + # Start bootcharting as soon as possible after the data partition is # mounted to collect more data. mkdir /data/bootchart 0755 shell shell @@ -449,7 +452,6 @@ 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 |