diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-09-30 22:01:09 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-09-30 22:01:09 +0100 |
| commit | 9dd6442c81aaf9b7bebe5586dcc505413d27c2be (patch) | |
| tree | adf652662beacfcabc9495c2c0d34e5b380a188a /scripts | |
| parent | 8d4e9e46d18dd41b279f7b0d93d07ab91ebb61a7 (diff) | |
| parent | bd9b004c686847f77013a360536fd5d2164d3241 (diff) | |
| download | rabbitmq-server-git-9dd6442c81aaf9b7bebe5586dcc505413d27c2be.tar.gz | |
merge bug21669 into default
Diffstat (limited to 'scripts')
| -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 |