am 974fe112: Merge "Fix recovery mode."

* commit '974fe112ae6df95ca6d49688d6e3e459d87e16de':
  Fix recovery mode.

1 files changed, 19 insertions, 1 deletions

diff --git a/etc/init.rc b/etc/init.rc
index 6e0595b..cd25d98 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -44,13 +44,31 @@ on fs
 
 
 on boot
-
     ifup lo
     hostname localhost
     domainname localdomain
 
     class_start default
 
+# Load properties from /system/ + /factory after fs mount.
+on load_all_props_action
+    load_all_props
+
+# Mount filesystems and start core system services.
+on late-init
+    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_all_props_action
+
+    trigger early-boot
+    trigger boot
+
 on property:sys.powerctl=*
    powerctl ${sys.powerctl}