summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiley Andrews <riandrews@google.com>2014-06-25 02:40:46 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-25 02:40:46 +0200
commit3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6 (patch)
tree8e161f6b96fdbecabb389b35aaa9e2acc7fe6501
parentam cfd4b286: Merge "recovery: initialize keys press tracking status" (diff)
parentMerge "Fix recovery mode." (diff)
downloadandroid_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar.gz
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar.bz2
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar.lz
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar.xz
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.tar.zst
android_bootable_recovery-3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6.zip
-rw-r--r--etc/init.rc20
1 files changed, 19 insertions, 1 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 6e0595b44..cd25d98dd 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}