Add RABBITMQ_ prefix, and source /etc/default/rabbitmq. Update erlang code

for the new environment variable names.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index b821fa0d..aebf46db 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -116,11 +116,12 @@ Available commands:
 Quiet output mode is selected with the \"-q\" flag. Informational messages
 are suppressed when quiet mode is in effect.
 
-<node> should be the name of the master node of the RabbitMQ cluster. It
-defaults to the node named \"rabbit\" on the local host. On a host named
-\"server.example.com\", the master node will usually be rabbit@server (unless
-NODENAME has been set to some non-default value at broker startup time). The
-output of hostname -s is usually the correct suffix to use after the \"@\" sign.
+<node> should be the name of the master node of the RabbitMQ
+cluster. It defaults to the node named \"rabbit\" on the local
+host. On a host named \"server.example.com\", the master node will
+usually be rabbit@server (unless RABBITMQ_NODENAME has been set to
+some non-default value at broker startup time). The output of hostname
+-s is usually the correct suffix to use after the \"@\" sign.
 
 "),
     halt(1).