diff options
| -rw-r--r-- | scripts/rabbitmq-defaults | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index f618f58426..c6923586ec 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -21,10 +21,8 @@ SYS_PREFIX= ### next line will be updated when generating a standalone release ERL_DIR= -### TODO fix these values -CLEAN_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_clean" -SASL_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_sasl" - +CLEAN_BOOT_FILE=start_clean +SASL_BOOT_FILE=start_sasl ## Set default values diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index d934725870..985c71220c 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -31,6 +31,7 @@ exec ${ERL_DIR}erl \ -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 c3d618684c..3253bd7b74 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -107,7 +107,7 @@ 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 b735162422..5471abf7ec 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -32,6 +32,7 @@ exec ${ERL_DIR}erl \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ -sname rabbitmqctl$$ \ + -boot "${CLEAN_BOOT_FILE}" \ -s rabbit_control_main \ -nodename $RABBITMQ_NODENAME \ -extra "$@" |