summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-01-01 01:13:34 +0000
committerChristian Ruppert <idl0r@gentoo.org>2012-01-01 01:13:34 +0000
commit925e176732c4348d2500ae60ff3ab03e73e5fba6 (patch)
tree8197101b6854240696de372d029149df6e3e643a /dev-vcs/monotone/files
parentRevbump. Don't use the deprecated $opts variable, bug 386759. (diff)
downloadgentoo-2-925e176732c4348d2500ae60ff3ab03e73e5fba6.tar.gz
gentoo-2-925e176732c4348d2500ae60ff3ab03e73e5fba6.tar.bz2
gentoo-2-925e176732c4348d2500ae60ff3ab03e73e5fba6.zip
Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 386757.
(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'dev-vcs/monotone/files')
-rw-r--r--dev-vcs/monotone/files/monotone-0.36.initd14
1 files changed, 7 insertions, 7 deletions
diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd
index 442707527cc7..fab2f03f1ef1 100644
--- a/dev-vcs/monotone/files/monotone-0.36.initd
+++ b/dev-vcs/monotone/files/monotone-0.36.initd
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
+# Copyright 2006-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.1 2010/03/05 16:49:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.2 2012/01/01 01:13:34 idl0r Exp $
-opts="import"
+extra_commands="import"
depend() {
need net
@@ -27,7 +27,7 @@ dbexists() {
if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then
ebegin "Creating monotone database"
start-stop-daemon --start \
- --chuid ${MTN_USER}:${MTN_GROUP} \
+ --user ${MTN_USER} --group ${MTN_GROUP} \
--exec /usr/bin/mtn -- ${MTN_COMMON} db init
eend $?
fi
@@ -36,9 +36,9 @@ dbexists() {
export MTN_PWD=${RANDOM}
yes "${MTN_PWD}" | \
start-stop-daemon --start \
- --chuid ${MTN_USER}:${MTN_GROUP} \
+ --user ${MTN_USER} --group ${MTN_GROUP} \
--exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY}
-
+
eend $?
# Update the password lua hook
cat > ${MTN_CONFDIR}/passphrase.lua <<EOF
@@ -62,7 +62,7 @@ start() {
ebegin "Starting monotone server"
start-stop-daemon --start --background \
- --chuid ${MTN_USER}:${MTN_GROUP} \
+ --user ${MTN_USER} --group ${MTN_GROUP} \
--exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \
--key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve
eend $?