Change init sequence to support file level encryption
File level encryption must get the key between mounting userdata and calling post_fs_data when the directories are created. This requires access to keymaster, which in turn is found from a system property. Split property loaded into system and data, and load in right order. Bug: 22233063 Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
This commit is contained in:
+3
-3
@@ -47,8 +47,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
|
||||||
@@ -63,7 +63,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
|
||||||
|
|||||||
Reference in New Issue
Block a user