diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-03-11 13:19:13 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-03-11 13:19:13 +0000 |
| commit | ef9420c928a853272b7c5d532e618f3d51a91cee (patch) | |
| tree | 0caae0c7a060832b49ab296bd70809a2b493f3b7 | |
| parent | c4cd61709b7981684fdf05c099de54951ca44193 (diff) | |
| parent | 0ecbdddce7d941089be013b4013515883e2729e9 (diff) | |
| download | rabbitmq-server-git-ef9420c928a853272b7c5d532e618f3d51a91cee.tar.gz | |
Merge branch 'bug26638'
| -rw-r--r-- | src/rabbit_nodes.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index d3c0e55ff8..bbe0d35719 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -200,11 +200,10 @@ set_cluster_name(Name) -> rabbit_runtime_parameters:set_global(cluster_name, Name). ensure_epmd() -> - {ok, Root} = init:get_argument(root), {ok, Prog} = init:get_argument(progname), ID = random:uniform(1000000000), Port = open_port( - {spawn_executable, filename:join([Root, "bin", Prog])}, + {spawn_executable, os:find_executable(Prog)}, [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]), "-noshell", "-eval", "halt()."]}, exit_status, stderr_to_stdout, use_stdio]), |