You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/10/15 23:28:50 UTC
svn commit: r1532542 - /qpid/trunk/qpid/cpp/etc/qpidd.in
Author: jross
Date: Tue Oct 15 21:28:49 2013
New Revision: 1532542
URL: http://svn.apache.org/r1532542
Log:
QPID-5035: Revert change 1510657, which incorrectly altered the config precedence
Modified:
qpid/trunk/qpid/cpp/etc/qpidd.in
Modified: qpid/trunk/qpid/cpp/etc/qpidd.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd.in?rev=1532542&r1=1532541&r2=1532542&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd.in (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd.in Tue Oct 15 21:28:49 2013
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org