diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-03-30 11:30:21 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-04-23 10:23:03 -0700 |
| commit | 4bf1887c787a025aad2fbafe382e556e85ac73b0 (patch) | |
| tree | df4b5d81b2e7ba676bf18a9c5f434a1971f93a4a /rootdir | |
| parent | 653f9581bf32cc2532c2b1d442d7bb2bbf0c173e (diff) | |
| download | core-4bf1887c787a025aad2fbafe382e556e85ac73b0.tar.gz core-4bf1887c787a025aad2fbafe382e556e85ac73b0.tar.bz2 core-4bf1887c787a025aad2fbafe382e556e85ac73b0.zip | |
Securely encrypt the master key
Remove unencrypted link since it is easier to manage directly
Move creation of key to vold
Start vold early so this is possible in a timely fashion
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/144586/
https://android-review.googlesource.com/#/c/144663/
https://android-review.googlesource.com/#/c/144672/
https://android-review.googlesource.com/#/c/144673/
Bug: 18151196
Change-Id: Idb17d1f1a724c6ec509d181ae4427113e9d3b5e6
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 a5ea60aaa..b353d9d4c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -226,14 +226,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 @@ -454,7 +457,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 |