diff options
| author | Micael Karlberg <[email protected]> | 2019-07-08 15:28:16 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-08 15:28:16 +0200 |
| commit | b40524bc9c0be4c11da28435e497c2a7c1f5368e (patch) | |
| tree | 9533fd449457ece7da3a20b19017c441111fd780 /erts/preloaded/src/erl_init.erl | |
| parent | 0199fc732374d0aab3b30a7153f62b03b3b39680 (diff) | |
| parent | f967324f020808955465a0714d9b0704d1c1d82c (diff) | |
| download | otp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.tar.gz otp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.tar.bz2 otp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.zip | |
Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maint
Diffstat (limited to 'erts/preloaded/src/erl_init.erl')
| -rw-r--r-- | erts/preloaded/src/erl_init.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl index d209c4033b..dadf7dda6f 100644 --- a/erts/preloaded/src/erl_init.erl +++ b/erts/preloaded/src/erl_init.erl @@ -35,7 +35,8 @@ start(Mod, BootArgs) -> erl_tracer:on_load(), prim_buffer:on_load(), prim_file:on_load(), - conditional_load(socket, [socket, net]), % socket:on_load(), net:on_load(), + %% socket:on_load(), prim_net:on_load(), + conditional_load(socket, [socket, prim_net]), %% Proceed to the specified boot module run(Mod, boot, BootArgs). @@ -49,7 +50,9 @@ run(M, F, A) -> end. conditional_load(CondMod, Mods2Load) -> - conditional_load(CondMod, erlang:loaded(), Mods2Load). + Loaded = erlang:loaded(), + %% erlang:display({?MODULE, conditional_load, Loaded}), + conditional_load(CondMod, Loaded, Mods2Load). conditional_load(_CondMod, [], _Mods2LOad) -> ok; |