specifies boot file for erl calls

4 files changed, 5 insertions, 5 deletions

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index f618f584..c6923586 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 d9347258..985c7122 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 c3d61868..3253bd7b 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 b7351624..5471abf7 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 "$@"