diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2018-02-21 05:06:58 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-02-21 05:06:58 +0300 |
| commit | d8b32130b8d386121ba953ef1487a3b2e67b7f44 (patch) | |
| tree | 92abe34c84c3aca2e394b3b073a988472452b7bf /scripts/rabbitmq-env | |
| parent | 1675ca9b3430335b44cc194f707b779fde773cc6 (diff) | |
| parent | 20f02c877b4e5dfdba4cdcc1849f1437b53eaadb (diff) | |
| download | rabbitmq-server-git-d8b32130b8d386121ba953ef1487a3b2e67b7f44.tar.gz | |
Merge branch 'master' into rabbitmq-server-1508-master
Conflicts:
scripts/rabbitmq-env
scripts/rabbitmq-service.bat
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 5214c686d2..2a1730f302 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,17 +344,16 @@ run_escript() escript="${1:?escript must be defined}" shift - # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be - # word-split # shellcheck disable=SC2086 exec "${ERL_DIR}erl" +B \ - -boot "$CLEAN_BOOT_FILE" \ + -boot "${CLEAN_BOOT_FILE}" \ -noinput -noshell -hidden -smp enable \ $RABBITMQ_CTL_ERL_ARGS \ -kernel inet_dist_listen_min "$RABBITMQ_CTL_DIST_PORT_MIN" \ -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \ -sasl errlog_type error \ - -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ + -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ + -nodename "$RABBITMQ_NODENAME" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" |