diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-25 00:42:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-25 00:42:58 +0000 |
| commit | 7c6d5dd8635751364ba7b5fc6452750a6203d32c (patch) | |
| tree | efe41433dc44f06ab6c32e085d06bf746b57876a /init | |
| parent | 2bca03cd0c8ad7f0d55b1d7f6acc03257077f854 (diff) | |
| parent | bdf133de65a1fbb2d5e91fcd854d9824bcff4ea1 (diff) | |
| download | system_core-7c6d5dd8635751364ba7b5fc6452750a6203d32c.zip system_core-7c6d5dd8635751364ba7b5fc6452750a6203d32c.tar.gz system_core-7c6d5dd8635751364ba7b5fc6452750a6203d32c.tar.bz2 | |
am bdf133de: am 662baefb: Merge "Setup signal handler before any exec command"
* commit 'bdf133de65a1fbb2d5e91fcd854d9824bcff4ea1':
Setup signal handler before any exec command
Diffstat (limited to 'init')
| -rw-r--r-- | init/init.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index 661ee2f..da35a9d 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -1065,6 +1065,9 @@ int main(int argc, char** argv) { init_parse_config_file("/init.rc"); + // Setup signal handler before any exec command or we'll deadlock + queue_builtin_action(signal_init_action, "signal_init"); + action_for_each_trigger("early-init", action_add_queue_tail); queue_builtin_action(wait_for_coldboot_done_action, "wait_for_coldboot_done"); @@ -1079,7 +1082,6 @@ int main(int argc, char** argv) { // wasn't ready immediately after wait_for_coldboot_done queue_builtin_action(mix_hwrng_into_linux_rng_action, "mix_hwrng_into_linux_rng"); queue_builtin_action(property_service_init_action, "property_service_init"); - queue_builtin_action(signal_init_action, "signal_init"); // Don't mount filesystems or start core system services in charger mode. char bootmode[PROP_VALUE_MAX]; |