diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-25 00:24:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-25 00:24:55 +0000 |
| commit | 662baefbb7ceaf2f2502f4e7752d4a6d835f216a (patch) | |
| tree | 7b5e2ed086b59ed4bf55f9213f91345bc91cec7a /init | |
| parent | 05c92d2b4fa7e96f6e64384f197e12916ed1d821 (diff) | |
| parent | 4f673306fc20736be4f4fab602718f9dd28ff5e9 (diff) | |
| download | system_core-662baefbb7ceaf2f2502f4e7752d4a6d835f216a.zip system_core-662baefbb7ceaf2f2502f4e7752d4a6d835f216a.tar.gz system_core-662baefbb7ceaf2f2502f4e7752d4a6d835f216a.tar.bz2 | |
Merge "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]; |