diff options
| author | Riley Andrews <riandrews@google.com> | 2014-06-23 15:20:51 -0700 |
|---|---|---|
| committer | Riley Andrews <riandrews@google.com> | 2014-06-23 15:20:51 -0700 |
| commit | 6bd4588d65977956cadf2e5d384673c64329c8e8 (patch) | |
| tree | f9f56e60e15c9b1a244e28e920acd064f70f44f2 /rootdir | |
| parent | 62ecd51f8a5435e925382ee1f0064655b75cc936 (diff) | |
| parent | 079c637f3d269242bbc772b9207179b8cf56738a (diff) | |
| download | system_core-6bd4588d65977956cadf2e5d384673c64329c8e8.zip system_core-6bd4588d65977956cadf2e5d384673c64329c8e8.tar.gz system_core-6bd4588d65977956cadf2e5d384673c64329c8e8.tar.bz2 | |
resolved conflicts for merge of 079c637f to master
Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 8a4a37d..7d2addb 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -158,6 +158,31 @@ on init chown system log /sys/fs/pstore/console-ramoops chmod 0440 /sys/fs/pstore/console-ramoops +# Healthd can trigger a full boot from charger mode by signaling this +# property when the power button is held. +on property:sys.boot_from_charger_mode=1 + class_stop charger + trigger late-init + +# 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 post-fs # once everything is setup, no need to modify / mount rootfs rootfs / ro remount |