From 6a75c2b40b0df9fab0ce675540557fff7b46f9de Mon Sep 17 00:00:00 2001
From: Justin Ross <jross@apache.org>
Date: Mon, 5 Aug 2013 18:49:30 +0000
Subject: QPID-5035: Respect data-dir setting from config file

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1510657 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/etc/qpidd.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpp/etc/qpidd.in b/cpp/etc/qpidd.in
index 91448add02..b53ea40a1f 100755
--- a/cpp/etc/qpidd.in
+++ b/cpp/etc/qpidd.in
@@ -63,9 +63,8 @@ if [ $RETVAL = 4 ]; then
 fi
 
 start() {
-        [[ $QPID_DATA_DIR ]] || QPID_DATA_DIR=/var/lib/qpidd
         echo -n $"Starting Qpid AMQP daemon: "
-	daemon --pidfile $pidfile --check $prog --user qpidd @sbindir@/$prog --data-dir $QPID_DATA_DIR --daemon $QPIDD_OPTIONS
+	daemon --pidfile $pidfile --check $prog --user qpidd @sbindir@/$prog ${QPID_DATA_DIR:+--data-dir $QPID_DATA_DIR} --daemon $QPIDD_OPTIONS
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch $lockfile
-- 
cgit v1.2.1