From f1f6ba4da602eb96727b6e9b5ac3dfdac17a1bd8 Mon Sep 17 00:00:00 2001 From: Luis Rascao Date: Sat, 12 Sep 2015 15:48:30 +0100 Subject: Fix crash on init restart On load handler process not being launched on a restart, NIF's such as asn1rt_nif require it to be present for correct loading. --- erts/preloaded/ebin/init.beam | Bin 48768 -> 48812 bytes erts/preloaded/src/init.erl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam index 851513b2e9..73dfb3d351 100644 Binary files a/erts/preloaded/ebin/init.beam and b/erts/preloaded/ebin/init.beam differ diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index c4e37b76f1..0ad5824ad1 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -167,7 +167,6 @@ stop(Status) -> init ! {stop,{stop,Status}}, ok. boot(BootArgs) -> register(init, self()), process_flag(trap_exit, true), - start_on_load_handler_process(), {Start0,Flags,Args} = parse_boot_args(BootArgs), Start = map(fun prepare_run_args/1, Start0), Flags0 = flags_to_atoms_again(Flags), @@ -225,6 +224,7 @@ code_path_choice() -> end. boot(Start,Flags,Args) -> + start_on_load_handler_process(), BootPid = do_boot(Flags,Start), State = #state{flags = Flags, args = Args, -- cgit v1.2.3