From 105bb0db55ad522451dc1121f548d148f4cbdac1 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Thu, 14 Nov 2019 10:40:44 -0800
Subject: [PATCH] epmd-starter improvements

* Use `noinput`
* Use `-s erlang halt` to skip small `eval` overhead
* Use `no_dot_erlang` boot file since we do not want user customizations to interfere
---
 src/rabbit_nodes_common.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl
index 706df558..f06c3d06 100644
--- a/src/rabbit_nodes_common.erl
+++ b/src/rabbit_nodes_common.erl
@@ -82,8 +82,9 @@ do_ensure_epmd(Exe, _) ->
     ID = rabbit_misc:random(1000000000),
     Port = open_port(
              {spawn_executable, Exe},
-             [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]),
-                      "-noshell", "-eval", "halt()."]},
+             [{args, ["-boot", "no_dot_erlang",
+                      "-sname", rabbit_misc:format("epmd-starter-~b", [ID]),
+                      "-noinput", "-s", "erlang", "halt"]},
               exit_status, stderr_to_stdout, use_stdio]),
     port_shutdown_loop(Port).