diff options
| author | Zandra <[email protected]> | 2015-11-20 09:45:45 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-20 09:45:45 +0100 |
| commit | 17f94df030a237743df2eaf7415de14a35d9179e (patch) | |
| tree | f863cf547b9bf0196deb845b0b9e1afb67332d6b /erts | |
| parent | d4a3296ba3117315343057715ee428490e992ef0 (diff) | |
| parent | f1f6ba4da602eb96727b6e9b5ac3dfdac17a1bd8 (diff) | |
| download | otp-17f94df030a237743df2eaf7415de14a35d9179e.tar.gz otp-17f94df030a237743df2eaf7415de14a35d9179e.tar.bz2 otp-17f94df030a237743df2eaf7415de14a35d9179e.zip | |
Merge branch 'lrascao/fix/vm_crash_on_init_restart' into maint
* lrascao/fix/vm_crash_on_init_restart:
Fix crash on init restart
OTP-13115
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 48768 -> 48812 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex 851513b2e9..73dfb3d351 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam 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, |