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 | |
| parent | 08877efa78ca44cb0324d1d4242e01d4dab92933 (diff) | |
| parent | ffeb160eda7a99d5d8935d1b2f90798a39782c13 (diff) | |
| download | rabbitmq-server-git-97494a765a8bef90b202357f04d96e4b39cc255e.tar.gz | |
merge bug25537 into stable
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 7 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 3 |
4 files changed, 14 insertions, 5 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index db1d4f2b4d..83c5639d87 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -18,6 +18,12 @@ ### next line potentially updated in package install steps SYS_PREFIX= +### next line will be updated when generating a standalone release +ERL_DIR= + +CLEAN_BOOT_FILE=start_clean +SASL_BOOT_FILE=start_sasl + ## Set default values CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 43f450c05a..c043c90afa 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -26,11 +26,12 @@ ##--- End of overridden <var_name> variables -exec erl \ +exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ -sname rabbitmq-plugins$$ \ + -boot "${CLEAN_BOOT_FILE}" \ -s rabbit_plugins_main \ -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \ -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \ 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} \ diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 00fffa9f75..0368db3f4c 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -26,12 +26,13 @@ ##--- End of overridden <var_name> variables -exec erl \ +exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ -sname rabbitmqctl$$ \ + -boot "${CLEAN_BOOT_FILE}" \ -s rabbit_control_main \ -nodename $RABBITMQ_NODENAME \ -extra "$@" |