diff options
| author | Paul Jones <paulj@lshift.net> | 2009-09-24 11:09:48 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-09-24 11:09:48 +0100 |
| commit | d2095944c2bf98db37344f445041711dc5b6e998 (patch) | |
| tree | e8c05c0ec9e87b5c773ef249e88aa5c7da38d1e5 /scripts/rabbitmq-server | |
| parent | 978685e6e075a102776fb3a1cd799ea2a48024cc (diff) | |
| download | rabbitmq-server-git-d2095944c2bf98db37344f445041711dc5b6e998.tar.gz | |
Added rabbit:prepare to the generated boot file; removed call to rabbit:start when using a boot file
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index e5317bb149..7a257834f3 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -74,7 +74,6 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' -[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="${RABBITMQ_START_RABBIT} -s rabbit" RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then @@ -83,6 +82,7 @@ if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY" else RABBITMQ_BOOT_FILE=start_sasl RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" + [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="${RABBITMQ_START_RABBIT} -s rabbit" fi # we need to turn off path expansion because some of the vars, notably |