diff options
| author | Justin Ross <jross@apache.org> | 2013-08-05 18:49:30 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2013-08-05 18:49:30 +0000 |
| commit | 866bf57249e41266cd713a5f73e3d18d216fad31 (patch) | |
| tree | 6ae05513b2457c3476eada3b48d0e2ae0ea174bc /qpid | |
| parent | 463188b92d4a309cc7219df76c2469f9e2c242c4 (diff) | |
| download | qpid-python-866bf57249e41266cd713a5f73e3d18d216fad31.tar.gz | |
QPID-5035: Respect data-dir setting from config file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1510657 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rwxr-xr-x | qpid/cpp/etc/qpidd.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in index 91448add02..b53ea40a1f 100755 --- a/qpid/cpp/etc/qpidd.in +++ b/qpid/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 |