qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jr...@apache.org
Subject svn commit: r1532542 - /qpid/trunk/qpid/cpp/etc/qpidd.in
Date Tue, 15 Oct 2013 21:28:50 GMT
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


Mime
View raw message