diff options
| author | Vlad Ionescu <vlad@lshift.net> | 2009-09-22 14:55:12 +0100 |
|---|---|---|
| committer | Vlad Ionescu <vlad@lshift.net> | 2009-09-22 14:55:12 +0100 |
| commit | eb99746359fbe4591fceb0d8b5b80f4cece1e2bf (patch) | |
| tree | 0b48a1c83c8d5f2612dd030f08b4b08fe96609a3 /scripts/rabbitmq-server | |
| parent | 16f90196497b609743987c67bbbfb2e1fc7f338d (diff) | |
| parent | 46bb73b94cfb4bb044096ae75ec5234c46ada561 (diff) | |
| download | rabbitmq-server-git-eb99746359fbe4591fceb0d8b5b80f4cece1e2bf.tar.gz | |
merging from 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 |