Revert "Change init sequence to support file level encryption"
This reverts commit d815178b7512cb44d8b5f234e3f823b5a3e44dea.
Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b25a371..3353c64 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -181,8 +181,8 @@
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 @@
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