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 | 6a75c2b40b0df9fab0ce675540557fff7b46f9de (patch) | |
| tree | 538c1bdb59414619c268a037b8a3ca3be1286059 | |
| parent | aebef333b54325ede3b56e2b741e2668c7e8dde6 (diff) | |
| download | qpid-python-6a75c2b40b0df9fab0ce675540557fff7b46f9de.tar.gz | |
QPID-5035: Respect data-dir setting from config file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1510657 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | cpp/etc/qpidd.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/etc/qpidd.in b/cpp/etc/qpidd.in index 91448add02..b53ea40a1f 100755 --- a/cpp/etc/qpidd.in +++ b/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 |