ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Setup signal handler before any exec command"

Browse source
This commit is contained in:
Elliott Hughes 2015-04-25 00:24:55 +00:00 • committed by Gerrit Code Review
commit 662baefbb7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/init.cpp
View file

@ -1065,6 +1065,9 @@ int main(int argc, char** argv) {
init_parse_config_file("/init.rc"); 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); action_for_each_trigger("early-init", action_add_queue_tail);
queue_builtin_action(wait_for_coldboot_done_action, "wait_for_coldboot_done"); 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 // 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(mix_hwrng_into_linux_rng_action, "mix_hwrng_into_linux_rng");
queue_builtin_action(property_service_init_action, "property_service_init"); 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. // Don't mount filesystems or start core system services in charger mode.
char bootmode[PROP_VALUE_MAX]; char bootmode[PROP_VALUE_MAX];