From 689ad38a3f4c5ff468bc3c7ae095019f79c97f9d Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Tue, 3 Jun 2008 15:13:01 +0000
Subject: QPID-1114 moved --pid-dir from config file to startup script

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662821 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/etc/qpidd      | 4 ++--
 qpid/cpp/etc/qpidd.conf | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd
index 62b92b223a..1071ddbffe 100755
--- a/qpid/cpp/etc/qpidd
+++ b/qpid/cpp/etc/qpidd
@@ -32,14 +32,14 @@ RETVAL=0
 
 start() {
 	echo -n $"Starting Qpid AMQP daemon: "
-	daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon $QPIDD_OPTIONS
+	daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch $lockfile
 	if [ $RETVAL = 0 ]; then
 	    touch $pidfile
 	    chown qpidd.qpidd $pidfile
-	    runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile"
+	    runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile"
 	fi
 	return $RETVAL
 }
diff --git a/qpid/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf
index 64126be454..8064767e78 100644
--- a/qpid/cpp/etc/qpidd.conf
+++ b/qpid/cpp/etc/qpidd.conf
@@ -1,3 +1,2 @@
 # Configuration file for qpidd.
 # Using default settings, qpidd --help to see defaults.
-pid-dir=/var/run/qpidd
-- 
cgit v1.2.1