From e56bec64777c277833552303caa2d0c09b702831 Mon Sep 17 00:00:00 2001
From: Daniil Fedotov <dfedotov@pivotal.io>
Date: Thu, 3 Dec 2015 15:45:21 +0000
Subject: [PATCH] Make wait command wait for start_rabbitmq_server command

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

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 71a653032168..69c2b7ff6c10 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -161,7 +161,8 @@ if [ 'x' = "x$RABBITMQ_ALLOW_INPUT" -a -z "$detached" ]; then
     start_rabbitmq_server "$@" &
 
     # Block until RabbitMQ exits or a signal is caught.
-    wait
+    # Waits for last command (which is start_rabbitmq_server)
+    wait $!
 else
     start_rabbitmq_server "$@"
 fi