diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-07 17:28:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 17:29:00 +0000 |
| commit | 8104616696ac5e806b16a393ea02c4f5d8efc328 (patch) | |
| tree | 7d80a4889001e1a9bb00a3dab9a57fde49d62cc0 /rootdir | |
| parent | 833f142d201a4b682885ff9d95c6b3ab32fd0618 (diff) | |
| parent | 437bc5dceca1608456c1c40b694645bc2d100ad4 (diff) | |
| download | system_core-8104616696ac5e806b16a393ea02c4f5d8efc328.zip system_core-8104616696ac5e806b16a393ea02c4f5d8efc328.tar.gz system_core-8104616696ac5e806b16a393ea02c4f5d8efc328.tar.bz2 | |
Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index dd97bcd..7af2b77 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -181,8 +181,8 @@ on property:sys.boot_from_charger_mode=1 trigger late-init # Load properties from /system/ + /factory after fs mount. -on load_system_props_action - load_system_props +on load_all_props_action + load_all_props start logd start logd-reinit @@ -195,16 +195,12 @@ 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_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 + trigger load_all_props_action # Remove a file to wake up anything waiting for firmware. trigger firmware_mounts_complete |