diff options
| author | Marek Majkowski <majek@lshift.net> | 2009-09-29 13:22:11 +0100 |
|---|---|---|
| committer | Marek Majkowski <majek@lshift.net> | 2009-09-29 13:22:11 +0100 |
| commit | 63b28edec9dfbbcbcb004babf9d1d42a47b2488e (patch) | |
| tree | def2b2c4e71342750533174d0ffa8d17f996bd7b /scripts/rabbitmq-server | |
| parent | 9354c7fdacc49a3fa9a40eea66df897feb4f1328 (diff) | |
| parent | bca6c53111013d880d88794440d8923f9c97ffe1 (diff) | |
| download | rabbitmq-server-git-63b28edec9dfbbcbcb004babf9d1d42a47b2488e.tar.gz | |
Default merged into bug 21457
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 89537ddf82..7019cd136a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -73,10 +73,11 @@ else fi RABBITMQ_START_RABBIT= -[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s 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" ]; then +if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit" RABBITMQ_EBIN_PATH="" else |