summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2008-08-30 20:18:11 +0000
committerJan Lehnardt <jan@apache.org>2008-08-30 20:18:11 +0000
commitb1d05573d71483f22d6c32125c04407eaefdffcf (patch)
treeb6e0725c2611eb83bdd65243bf519491dbf67091
parente5b395f06833a84c93e38fcb80fa6d238925cf09 (diff)
Fix multi-ini-file support with -b option.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@690575 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--bin/couchdb.tpl.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 5de3a682..f43fe987 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -180,6 +180,7 @@ start_couchdb () {
start_arguments="$start_arguments, ";
fi
start_arguments="$start_arguments \\\"$file\\\""
+ background_start_arguments="$background_start_arguments -c \\\"$file\\\""
done
command="`%ICU_CONFIG% --invoke` \
%ERL% $interactive_option -smp auto -sasl errlog_type error +K true \
@@ -193,7 +194,7 @@ start_couchdb () {
-eval \"couch_server:start([$start_arguments]), receive done -> done end.\" "
if test "$BACKGROUND_BOOLEAN" = "true" \
-a "$RECURSED_BOOLEAN" = "false"; then
- $0 -c $ini_files -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
+ $0 $background_start_arguments -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
-o $STDOUT_FILE -e $STDERR_FILE -R &
echo "Apache CouchDB has started, time to relax."
else