diff options
| author | Paul Jones <paulj@lshift.net> | 2009-09-24 08:20:43 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-09-24 08:20:43 +0100 |
| commit | 4e5be6475404c8a5a799b8edd9faba971b3be245 (patch) | |
| tree | e86e85431904e00a800abe81971d231c23e835ca /scripts/rabbitmq-server | |
| parent | 1db8635ccb9e12af63e23459f6d3188c751b2448 (diff) | |
| parent | 978685e6e075a102776fb3a1cd799ea2a48024cc (diff) | |
| download | rabbitmq-server-git-4e5be6475404c8a5a799b8edd9faba971b3be245.tar.gz | |
Merged default
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 547220b4a5..e5317bb149 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 |