Merge bug25722 (again)

2 files changed, 5 insertions, 4 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 79070315..03cd80e1 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -85,10 +85,11 @@ case "$(uname -s)" in
            fi
 esac
 
-export RABBITMQ_CONFIG_FILE RABBITMQ_DIST_PORT
-
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
-${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
+
+RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
+    ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
     -boot "${CLEAN_BOOT_FILE}" \
     -noinput \
     -hidden \
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 9e8f15b8..4037ed44 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -102,7 +102,7 @@ dist_port_use_check(NodeHost) ->
     case os:getenv("RABBITMQ_DIST_PORT") of
         false   -> ok;
         PortStr -> Port = list_to_integer(PortStr),
-                   case gen_tcp:listen(Port, [inet]) of
+                   case gen_tcp:listen(Port, [inet, {reuseaddr, true}]) of
                        {ok, Sock} -> gen_tcp:close(Sock);
                        {error, _} -> dist_port_use_check_fail(Port, NodeHost)
                    end