diff options
| author | Micael Karlberg <[email protected]> | 2019-02-04 14:47:48 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-02-04 14:47:48 +0100 |
| commit | ad0beca8fb612fa33dabcfb3592796a92e858684 (patch) | |
| tree | 97fdd079a2a8abfb3b9de8992ef6452dd2193acd /erts/preloaded/src/erl_init.erl | |
| parent | 4b3c3ae0bdcab6028faa5a5ea3e4076ce6af5de4 (diff) | |
| parent | 875825874d4a8d52ec5cc593f5024afc696c29df (diff) | |
| download | otp-ad0beca8fb612fa33dabcfb3592796a92e858684.tar.gz otp-ad0beca8fb612fa33dabcfb3592796a92e858684.tar.bz2 otp-ad0beca8fb612fa33dabcfb3592796a92e858684.zip | |
Merge branch 'bmk/20180918/nififying_inet/OTP-14831' into bmk/20190204/socket_as_nif/OTP-14831
Diffstat (limited to 'erts/preloaded/src/erl_init.erl')
| -rw-r--r-- | erts/preloaded/src/erl_init.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl index d681f05398..6edead362c 100644 --- a/erts/preloaded/src/erl_init.erl +++ b/erts/preloaded/src/erl_init.erl @@ -35,6 +35,8 @@ start(Mod, BootArgs) -> erl_tracer:on_load(), prim_buffer:on_load(), prim_file:on_load(), + socket:on_load(), + net:on_load(), %% Proceed to the specified boot module run(Mod, boot, BootArgs). |