am 10cf0942
: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527': Revert "Change init sequence to support file level encryption"
This commit is contained in:
commit
1915dd56e3
1 changed files with 3 additions and 3 deletions
|
@ -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_system_props_action
|
on load_all_props_action
|
||||||
load_system_props
|
load_all_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_system_props_action
|
trigger load_all_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
|
||||||
|
|
Loading…
Reference in a new issue