diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
| commit | 783c28fc1ff31620fa99a26280a583f9da8a9c06 (patch) | |
| tree | e2fb03b3933b107b8b17b302d568994208c8f1e9 /scripts/rabbitmq-multi | |
| parent | 9c8b9d142e64b6975029f5c41421c3c4dc3022e9 (diff) | |
| parent | 71077f0a21145fbd72db936b95c5075c0910e3e6 (diff) | |
| download | rabbitmq-server-git-783c28fc1ff31620fa99a26280a583f9da8a9c06.tar.gz | |
Merge v1_5 into bug20329
Diffstat (limited to 'scripts/rabbitmq-multi')
| -rwxr-xr-x | scripts/rabbitmq-multi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 84985e900f..4cf0703a4c 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -30,7 +30,7 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit @@ -54,6 +54,11 @@ export \ RABBITMQ_SCRIPT_HOME \ RABBITMQ_PIDS_FILE +# we need to turn off path expansion because some of the vars, notably +# RABBITMQ_MULTI_ERL_ARGS, may contain terms that look like globs and +# there is no other way of preventing their expansion. +set -f + exec erl \ -pa "`dirname $0`/../ebin" \ -noinput \ |