summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/common/rabbitmq-server.init2
-rwxr-xr-xscripts/rabbitmq-server4
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index b1d38646ea..039738dad3 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -41,7 +41,7 @@ start_rabbitmq () {
else
RETVAL=0
set +e
- setsid sh -c "PID_FILE=$PID_FILE $DAEMON > \
+ setsid sh -c "RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" &
$CONTROL wait $PID_FILE >/dev/null 2>&1
RETVAL=$?
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 13584541db..94810a3747 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -97,8 +97,8 @@ RABBITMQ_LISTEN_ARG=
# there is no other way of preventing their expansion.
set -f
-if [ -n "$PID_FILE" ] ; then
- echo $$ > $PID_FILE
+if [ -n "$RABBITMQ_PID_FILE" ] ; then
+ echo $$ > $RABBITMQ_PID_FILE
fi
exec erl \