diff options
| author | Lukas Larsson <[email protected]> | 2019-05-29 11:15:41 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-05-29 11:15:41 +0200 |
| commit | b9c4587833e5c87f5bf9526f7bc0de3993d68bf8 (patch) | |
| tree | 0cfc4811ccf284310ee842c33df147cef1007512 /lib/kernel/src | |
| parent | 1550304a8857c9eca31dffdb27dcf459d8f11076 (diff) | |
| parent | 5d1b87498986731c82d543b86c297956fa8c3abf (diff) | |
| download | otp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.tar.gz otp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.tar.bz2 otp-b9c4587833e5c87f5bf9526f7bc0de3993d68bf8.zip | |
Merge branch 'kuroneer/multiple-mode-flags/OTP-15852' into maint
* kuroneer/multiple-mode-flags/OTP-15852:
Update preloaded modules
Add comment to doc regarding multiple -mode flags
Extra -mode flags are ignored with a warning
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code.erl | 18 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.erl | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl index 7faef93609..964ede9bc9 100644 --- a/lib/kernel/src/code.erl +++ b/lib/kernel/src/code.erl @@ -19,6 +19,8 @@ %% -module(code). +-include_lib("kernel/include/logger.hrl"). + %% This is the interface module to the code server. It also contains %% some implementation details. See also related modules: code_*.erl %% in this directory. @@ -707,8 +709,20 @@ do_s(Lib) -> start_get_mode() -> case init:get_argument(mode) of - {ok,[["embedded"]]} -> - embedded; + {ok, [FirstMode | Rest]} -> + case Rest of + [] -> + ok; + _ -> + ?LOG_WARNING("Multiple -mode given to erl, using the first, ~p", + [FirstMode]) + end, + case FirstMode of + ["embedded"] -> + embedded; + _ -> + interactive + end; _ -> interactive end. diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl index bc4f09a023..c8c631ab23 100644 --- a/lib/kernel/src/kernel.erl +++ b/lib/kernel/src/kernel.erl @@ -141,7 +141,7 @@ init([]) -> modules => [logger_sup]}, case init:get_argument(mode) of - {ok, [["minimal"]]} -> + {ok, [["minimal"]|_]} -> {ok, {SupFlags, [Code, File, StdError, User, LoggerSup, Config, RefC, SafeSup]}}; _ -> |