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

* commit 'd6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c':
  Change init sequence to support file level encryption
This commit is contained in:
Paul Lawrence
2015-07-06 19:47:31 +00:00
committed by Android Git Automerger
+3 -3
View File
@@ -46,8 +46,8 @@ on boot
class_start default class_start default
# Load properties from /system/ + /factory after fs mount. # Load properties from /system/ + /factory after fs mount.
on load_all_props_action on load_system_props_action
load_all_props load_system_props
on firmware_mounts_complete on firmware_mounts_complete
rm /dev/.booting rm /dev/.booting
@@ -62,7 +62,7 @@ on late-init
# Load properties from /system/ + /factory after fs mount. Place # Load properties from /system/ + /factory after fs mount. Place
# this in another action so that the load will be scheduled after the prior # this in another action so that the load will be scheduled after the prior
# issued fs triggers have completed. # 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 # Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete trigger firmware_mounts_complete