From ee36f22d3d966fa3e13e1ca538511f7d656f1333 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@redhat.com>
Date: Fri, 15 Jul 2016 16:01:08 +0200
Subject: [PATCH] Use proto_dist from config instead of always using default
 (inet_tcp)

Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
---
 src/rabbit_nodes.erl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
index 70a5355d..6bfce23f 100644
--- a/src/rabbit_nodes.erl
+++ b/src/rabbit_nodes.erl
@@ -221,9 +221,11 @@ set_cluster_name(Name) ->
 ensure_epmd() ->
     {ok, Prog} = init:get_argument(progname),
     ID = rabbit_misc:random(1000000000),
+    ProtoDist = application:get_env(kernel, proto_dist, inet_tcp),
     Port = open_port(
              {spawn_executable, os:find_executable(Prog)},
              [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]),
+                      "-proto_dist", rabbit_misc:format("~p", [ProtoDist]),
                       "-noshell", "-eval", "halt()."]},
               exit_status, stderr_to_stdout, use_stdio]),
     port_shutdown_loop(Port).