diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-09-25 11:40:11 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-09-25 11:40:11 +0100 |
| commit | 24c0dadffbd1d5bf12e688eb9c13abb2734f2094 (patch) | |
| tree | 85942d59e596ae2ce4e593a5fbe5fb13e05deb14 /scripts/rabbitmq-server | |
| parent | c7f6e84de3e3df2d8069927ec16fa1d99ead6281 (diff) | |
| parent | b441f9e9f251859aa3e72a63c92a04cb1040ee3f (diff) | |
| download | rabbitmq-server-git-24c0dadffbd1d5bf12e688eb9c13abb2734f2094.tar.gz | |
merge default into bug21368
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 f802ec4c51..0716cf0763 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 |