From 609469d8575ba97ff79ebe8977c46e4efc27d660 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 15 Oct 2013 21:28:49 +0000 Subject: QPID-5035: Revert change 1510657, which incorrectly altered the config precedence git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1532542 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in index b53ea40a1f..91448add02 100755 --- a/qpid/cpp/etc/qpidd.in +++ b/qpid/cpp/etc/qpidd.in @@ -63,8 +63,9 @@ 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 ${QPID_DATA_DIR:+--data-dir $QPID_DATA_DIR} --daemon $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd @sbindir@/$prog --data-dir $QPID_DATA_DIR --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1