diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-05-16 12:13:19 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-05-16 12:13:19 +0100 |
| commit | 97494a765a8bef90b202357f04d96e4b39cc255e (patch) | |
| tree | a1781c38e8073b2fff247e0589bace6e79171a63 /scripts/rabbitmq-server | |
| parent | 08877efa78ca44cb0324d1d4242e01d4dab92933 (diff) | |
| parent | ffeb160eda7a99d5d8935d1b2f90798a39782c13 (diff) | |
| download | rabbitmq-server-git-97494a765a8bef90b202357f04d96e4b39cc255e.tar.gz | |
merge bug25537 into stable
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} \ |