diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
| commit | c07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch) | |
| tree | d9d528762b726855cc356781c89abb1768c8be28 /community-testing/couchdb/rc-script.patch | |
| parent | ece2137c9569ec806aacf3740df98c399a51b21a (diff) | |
| parent | 8119da2eaadf53531cad2aed70981ed4606340d6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/sword/PKGBUILD
community/freedroidrpg/PKGBUILD
community/pgadmin3/PKGBUILD
libre/lame-libre/PKGBUILD
testing/dbus-core/PKGBUILD
testing/libwebkit/PKGBUILD
testing/tracker/PKGBUILD
testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
testing/udev/0002-reinstate-TIMEOUT-handling.patch
testing/udev/PKGBUILD
Diffstat (limited to 'community-testing/couchdb/rc-script.patch')
| -rw-r--r-- | community-testing/couchdb/rc-script.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/community-testing/couchdb/rc-script.patch b/community-testing/couchdb/rc-script.patch new file mode 100644 index 000000000..1dd723ffc --- /dev/null +++ b/community-testing/couchdb/rc-script.patch @@ -0,0 +1,57 @@ +--- couchdb 2011-12-27 01:21:59.000000000 +0400 ++++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 +@@ -1,6 +1,4 @@ +-#!/bin/bash +-. /etc/rc.conf +-. /etc/rc.d/functions ++#!/bin/sh -e + + # Licensed under the Apache License, Version 2.0 (the "License"); you may not + # use this file except in compliance with the License. You may obtain a copy of +@@ -31,7 +29,7 @@ + NAME=couchdb + SCRIPT_NAME=`basename $0` + COUCHDB=/usr/bin/couchdb +-CONFIGURATION_FILE=/etc/conf.d/couchdb ++CONFIGURATION_FILE=/etc/default/couchdb + RUN_DIR=/var/run/couchdb + LSB_LIBRARY=/lib/lsb/init-functions + +@@ -44,14 +42,16 @@ + fi + + log_daemon_msg () { +- stat_busy $@ ++ # Dummy function to be replaced by LSB library. ++ ++ echo $@ + } + + log_end_msg () { ++ # Dummy function to be replaced by LSB library. ++ + if test "$1" != "0"; then +- stat_fail +- else +- stat_done ++ echo "Error with $DESCRIPTION: $NAME" + fi + return $1 + } +@@ -66,7 +66,7 @@ + command="$command $COUCHDB_OPTIONS" + fi + if test -n "$COUCHDB_USER"; then +- if su $COUCHDB_USER -s /bin/bash -c "$command"; then ++ if su $COUCHDB_USER -c "$command"; then + return $SCRIPT_OK + else + return $SCRIPT_ERROR +@@ -84,7 +84,6 @@ + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" +- chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" |