Merge branch 'richcarl/erts/erl_init-cleanup/OTP-15336'

* richcarl/erts/erl_init-cleanup/OTP-15336:
  sasl: Order systools_make:preloaded modules alphabetically
  Update preloaded modules
  Move calling on_load for preloaded modules to erl_init
  Make erl_init.c pass the boot module to erl_init.beam
  Remove obsolete comment text
  Remove undocumented and unused -# display_items emulator option
  Remove broken and undocumented boot function emulator option
  Replace remaining references to otp_ring0 with erl_init
  Drop otp_ring0, using erl_init instead
  Update preloaded modules
  Add erl_init module

Conflicts:
	erts/emulator/beam/erl_init.c
	erts/preloaded/ebin/erl_prim_loader.beam
	erts/preloaded/ebin/erl_tracer.beam
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/erts_code_purger.beam
	erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
	erts/preloaded/ebin/erts_internal.beam
	erts/preloaded/ebin/erts_literal_area_collector.beam
	erts/preloaded/ebin/init.beam
	erts/preloaded/ebin/otp_ring0.beam
	erts/preloaded/ebin/prim_buffer.beam
	erts/preloaded/ebin/prim_eval.beam
	erts/preloaded/ebin/prim_file.beam
	erts/preloaded/ebin/prim_inet.beam
	erts/preloaded/ebin/prim_zip.beam
	erts/preloaded/ebin/zlib.beam

4 files changed, 18 insertions, 13 deletions

diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index 4333f6643a..3c8d75b205 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -41,7 +41,7 @@ PRE_LOADED_ERL_MODULES = \
 	prim_inet \
 	zlib \
 	prim_zip \
-	otp_ring0 \
+	erl_init \
 	erts_code_purger \
 	erlang \
 	erts_internal \
diff --git a/erts/preloaded/src/otp_ring0.erl b/erts/preloaded/src/erl_init.erl
index 62a60fffe2..d681f05398 100644
--- a/erts/preloaded/src/otp_ring0.erl
+++ b/erts/preloaded/src/erl_init.erl
@@ -17,15 +17,26 @@
 %%
 %% %CopyrightEnd%
 %%
--module(otp_ring0).
+-module(erl_init).
 
-%% Purpose : Start up of erlang system.
+%% Initial process of an Erlang system.
 
 -export([start/2]).
 
--spec start(_, term()) -> term().
-start(_Env, Argv) ->
-    run(init, boot, Argv).
+%% This gets the module name given by the +i option (default 'init')
+%% and the list of command line arguments
+
+-spec start(Mod, BootArgs) -> no_return() when
+      Mod :: module(),
+      BootArgs :: [binary()].
+start(Mod, BootArgs) ->
+    %% Load the static nifs
+    zlib:on_load(),
+    erl_tracer:on_load(),
+    prim_buffer:on_load(),
+    prim_file:on_load(),
+    %% Proceed to the specified boot module
+    run(Mod, boot, BootArgs).
 
 run(M, F, A) ->
     case erlang:function_exported(M, F, 1) of
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 8c34c99a98..dc97b86d8c 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -26,7 +26,7 @@
 		erl_prim_loader,
 		erts_internal,
 		init,
-		otp_ring0,
+		erl_init,
 		erts_code_purger,
 		prim_buffer,
 		prim_eval,
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 253fcf7a1f..277e60c180 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -200,12 +200,6 @@ boot(BootArgs) ->
     register(init, self()),
     process_flag(trap_exit, true),
 
-    %% Load the static nifs
-    zlib:on_load(),
-    erl_tracer:on_load(),
-    prim_buffer:on_load(),
-    prim_file:on_load(),
-
     {Start0,Flags,Args} = parse_boot_args(BootArgs),
     %% We don't get to profile parsing of BootArgs
     case b2a(get_flag(profile_boot, Flags, false)) of