diff options
| author | Zandra <[email protected]> | 2015-11-20 09:46:15 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-20 09:46:15 +0100 |
| commit | e4163490d46b89f28cc8331cf846a576e1bc12de (patch) | |
| tree | b1675fdf181d97398a09b603f2f5097c0b5aebd9 /erts/preloaded | |
| parent | f7ac6ac502b6172622159588ab57d1a0b2da699a (diff) | |
| parent | 17f94df030a237743df2eaf7415de14a35d9179e (diff) | |
| download | otp-e4163490d46b89f28cc8331cf846a576e1bc12de.tar.gz otp-e4163490d46b89f28cc8331cf846a576e1bc12de.tar.bz2 otp-e4163490d46b89f28cc8331cf846a576e1bc12de.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
| -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, |