Merge branch 'jv-code-path-strict-updated'

* jv-code-path-strict-updated: Update preloaded modules Default -code_path_choice to strict OTP-18894
frazze-jobb · Dec 5, 2023 · a5fc6b5 · a5fc6b5
2 parents ad49d5d + e6757d2
commit a5fc6b5
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 11 deletions.
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
@@ -243,8 +243,7 @@
       <p>The support for loading of code from archive files is
         experimental. The only purpose of releasing it before it is ready
 	is to obtain early feedback. The file format, semantics,
-	interfaces, and so on, can  be changed in a future release. The
-        <c>-code_path_choice</c> flag is also experimental.</p>
+	interfaces, and so on, can  be changed in a future release.</p>
     </warning>
 
     <p>The <c>init</c> module interprets the following command-line flags:</p>
@@ -271,13 +270,8 @@
               and an <c>ebin</c> directory in an archive file.</p>
           </item>
         </list>
-        <p>This flag is particular
-          useful when you want to elaborate with code loading from
-          archives without editing the <c>boot script</c>. For more
-          information about interpretation of boot scripts, see
-          <seefile marker="sasl:script"><c>script(4)</c></seefile>.
-          The flag has also a similar effect on how the code server works; see
-          <seeerl marker="kernel:code"><c>code(3)</c></seeerl>.</p>
+            <p>It defaults to <c>strict</c> from OTP 27 and this option
+              is scheduled for removal in OTP 28.</p>
       </item>
       <tag><c>-epmd_module Module</c></tag>
       <item>

diff --git a/erts/preloaded/ebin/atomics.beam b/erts/preloaded/ebin/atomics.beam
diff --git a/erts/preloaded/ebin/counters.beam b/erts/preloaded/ebin/counters.beam
diff --git a/erts/preloaded/ebin/erl_init.beam b/erts/preloaded/ebin/erl_init.beam
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erl_tracer.beam b/erts/preloaded/ebin/erl_tracer.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam
diff --git a/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam b/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/erts_literal_area_collector.beam b/erts/preloaded/ebin/erts_literal_area_collector.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/persistent_term.beam b/erts/preloaded/ebin/persistent_term.beam
diff --git a/erts/preloaded/ebin/prim_buffer.beam b/erts/preloaded/ebin/prim_buffer.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_net.beam b/erts/preloaded/ebin/prim_net.beam
diff --git a/erts/preloaded/ebin/prim_socket.beam b/erts/preloaded/ebin/prim_socket.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/socket_registry.beam b/erts/preloaded/ebin/socket_registry.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
@@ -321,7 +321,7 @@ code_path_choice() ->
 	{ok,[["relaxed"]]} ->
 	    relaxed;
 	_Else ->
-	    relaxed
+	    strict
     end.
 
 boot(Start,Flags,Args) ->

diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
@@ -233,7 +233,8 @@ zip:create("mnesia-4.4.7.ez",
      script</c> can be <c>strict</c> or <c>relaxed</c>. It is
      particularly useful to set the flag to <c>relaxed</c> when
      elaborating with code loading from archives without editing the
-     <c>boot script</c>. The default is <c>relaxed</c>. See <seeerl
+     <c>boot script</c>. The default has changed to <c>strict</c>
+     in OTP 27 and the option is scheduled for removal in OTP 28. See <seeerl
      marker="erts:init"><c>erts:init(3)</c></seeerl>.</p></section>
 
   <section>