diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-03-25 15:51:12 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-03-25 15:51:12 +0000 |
| commit | 128e8a9c2b046424ccdaddf99ca2367d7a9b35f0 (patch) | |
| tree | 301dcb0c8c52a7ec3c0317ba2b4accb017a16978 /scripts/rabbitmq-server | |
| parent | 9e30dc1f3fbb472356a18d12577c974e11815492 (diff) | |
| parent | 99bdfa3cab648e5c3cb6a7f92fecdf6063360bf1 (diff) | |
| download | rabbitmq-server-git-128e8a9c2b046424ccdaddf99ca2367d7a9b35f0.tar.gz | |
Merged default into bug24114
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 184ae9311a..161ec2e6df 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -82,7 +82,8 @@ case "$(uname -s)" in esac RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -if ! erl -pa "$RABBITMQ_EBIN_ROOT" \ +if ! ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \ + -boot "${CLEAN_BOOT_FILE}" \ -noinput \ -hidden \ -s rabbit_prelaunch \ @@ -103,11 +104,11 @@ RABBITMQ_LISTEN_ARG= # there is no other way of preventing their expansion. set -f -exec erl \ +exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ - -boot start_sasl \ + -boot "${SASL_BOOT_FILE}" \ ${RABBITMQ_CONFIG_ARG} \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ |