summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-07-06 17:22:57 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-07-06 17:22:57 +0200
commit11b110a81633793d97d972b34c607599bd734fc9 (patch)
tree93ca87c809488487933131066942ba93c9922578 /Makefile
parentf46d3e3d9e02e2b191d00d2738309251d2797405 (diff)
parent8412720c2582a347d02ff04571869de0355178e2 (diff)
downloadrabbitmq-server-git-11b110a81633793d97d972b34c607599bd734fc9.tar.gz
Merge branch 'stable'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index af907163e2..546d30cf1a 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,12 @@ run-qc: all
start-background-node: all
-rm -f $(RABBITMQ_MNESIA_DIR).pid
mkdir -p $(RABBITMQ_MNESIA_DIR)
- nohup sh -c "$(MAKE) run-background-node > $(RABBITMQ_MNESIA_DIR)/startup_log 2> $(RABBITMQ_MNESIA_DIR)/startup_err" > /dev/null &
+ $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
+ RABBITMQ_NODE_ONLY=true \
+ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \
+ ./scripts/rabbitmq-server \
+ > $(RABBITMQ_MNESIA_DIR)/startup_log \
+ 2> $(RABBITMQ_MNESIA_DIR)/startup_err &
./scripts/rabbitmqctl -n $(RABBITMQ_NODENAME) wait $(RABBITMQ_MNESIA_DIR).pid kernel
start-rabbit-on-node: all