diff options
| author | Lukas Larsson <[email protected]> | 2019-05-29 11:15:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-05-29 11:15:53 +0200 |
| commit | 8a3cbfaec6e4691d80b2161ccc6b9935fd9d74cc (patch) | |
| tree | 7500a20e3cf6c40cc4ef5c99bd716bddf31e7fe4 /lib/kernel/src | |
| parent | ab027321ccf1098349117bdd07268e3c15eb5db8 (diff) | |
| parent | b9c4587833e5c87f5bf9526f7bc0de3993d68bf8 (diff) | |
| download | otp-8a3cbfaec6e4691d80b2161ccc6b9935fd9d74cc.tar.gz otp-8a3cbfaec6e4691d80b2161ccc6b9935fd9d74cc.tar.bz2 otp-8a3cbfaec6e4691d80b2161ccc6b9935fd9d74cc.zip | |
Merge branch 'maint'
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]}}; _ -> |