summaryrefslogtreecommitdiff
path: root/lib/kernel/src/kernel.erl
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kernel/src/kernel.erl')
-rw-r--r--lib/kernel/src/kernel.erl13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 049db0e50d..9aec16ace7 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -140,10 +140,16 @@ init([]) ->
type => supervisor,
modules => [logger_sup]},
+ Peer = case peer:supervision_child_spec() of
+ {ok, PeerSpec} -> [PeerSpec];
+ none -> []
+ end,
+
case init:get_argument(mode) of
{ok, [["minimal"]|_]} ->
{ok, {SupFlags,
- [Code, File, StdError, User, LoggerSup, Config, RefC, SafeSup]}};
+ [Code, File, StdError] ++ Peer ++
+ [User, LoggerSup, Config, RefC, SafeSup]}};
_ ->
DistChildren =
case application:get_env(kernel, start_distribution) of
@@ -170,7 +176,8 @@ init([]) ->
{ok, {SupFlags,
[Code, InetDb | DistChildren] ++
- [File, SigSrv, StdError, User, Config, RefC, SafeSup, LoggerSup] ++
+ [File, SigSrv, StdError] ++ Peer ++
+ [User, Config, RefC, SafeSup, LoggerSup] ++
Timer ++ CompileServer}}
end;
init(safe) ->