diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-13 16:55:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 16:56:02 +0000 |
| commit | d5ef984195779aa9e27d7baabdd751d641eea1a0 (patch) | |
| tree | 780c6a29669e3de4c81da2a8df7adbc6ed145534 /rootdir | |
| parent | 2407ec386514e40c5b4f2489c598b15af2a67c97 (diff) | |
| parent | 948410a4936fda5348304af9711db932926bcc1a (diff) | |
| download | system_core-d5ef984195779aa9e27d7baabdd751d641eea1a0.zip system_core-d5ef984195779aa9e27d7baabdd751d641eea1a0.tar.gz system_core-d5ef984195779aa9e27d7baabdd751d641eea1a0.tar.bz2 | |
Merge "Change init sequence to support file level encryption" into mnc-dr-dev
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 7af2b77..bdc89a6 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -181,8 +181,11 @@ on property:sys.boot_from_charger_mode=1 trigger late-init # Load properties from /system/ + /factory after fs mount. -on load_all_props_action - load_all_props +on load_system_props_action + load_system_props + +on load_persist_props_action + load_persist_props start logd start logd-reinit @@ -195,12 +198,16 @@ on late-init trigger early-fs trigger fs trigger post-fs - trigger post-fs-data # Load properties from /system/ + /factory after fs mount. Place # this in another action so that the load will be scheduled after the prior # issued fs triggers have completed. - trigger load_all_props_action + trigger load_system_props_action + + # Now we can mount /data. File encryption requires keymaster to decrypt + # /data, which in turn can only be loaded when system properties are present + trigger post-fs-data + trigger load_persist_props_action # Remove a file to wake up anything waiting for firmware. trigger firmware_mounts_complete |