diff options
| author | Justin Ross <jross@apache.org> | 2013-10-15 21:28:49 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2013-10-15 21:28:49 +0000 |
| commit | 609469d8575ba97ff79ebe8977c46e4efc27d660 (patch) | |
| tree | f8da6a237d189261c099dc4a14b89b2fad3caf05 /qpid/cpp/etc | |
| parent | c57f8415b0f2aeb7216999ad477521485c4fb443 (diff) | |
| download | qpid-python-609469d8575ba97ff79ebe8977c46e4efc27d660.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/etc')
| -rwxr-xr-x | qpid/cpp/etc/qpidd.in | 3 |
1 files changed, 2 insertions, 1 deletions
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 |