am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit 'b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c':
Revert "Change init sequence to support file level encryption"
diff --git a/etc/init.rc b/etc/init.rc
index dc18659..0a4c6e9 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -46,8 +46,8 @@
class_start default
# Load properties from /system/ + /factory after fs mount.
-on load_system_props_action
- load_system_props
+on load_all_props_action
+ load_all_props
on firmware_mounts_complete
rm /dev/.booting
@@ -62,7 +62,7 @@
# 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
+ trigger load_all_props_action
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete