From 87e5459f49ecf8c4a98da1d4570c4a7cfae0efc7 Mon Sep 17 00:00:00 2001
From: Tim Watson <tim.watson@gmail.com>
Date: Wed, 16 May 2012 14:46:11 +0100
Subject: revert to expected RABBITMQ_NODE_ONLY behaviour on unix

---
 scripts/rabbitmq-server | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 05998dd372..9d8710afeb 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -61,6 +61,9 @@ RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput"
 [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot "
 
+RABBITMQ_START_RABBIT=
+[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot"
+
 case "$(uname -s)" in
   CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
            # will not be able to make sense of it anyway
@@ -98,7 +101,6 @@ exec erl \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
     -boot start_sasl \
-    -s rabbit boot \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
-- 
cgit v1.2.1