Merge "Change init sequence to support file level encryption" into mnc-dev

This commit is contained in:
Paul Lawrence 2015-07-06 19:33:27 +00:00 committed by Android (Google) Code Review
commit d6b2b65dc4

View file

@ -47,8 +47,8 @@ on boot
class_start default
# 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 firmware_mounts_complete
rm /dev/.booting
@ -63,7 +63,7 @@ on late-init
# 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
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete