1 |
idl0r 12/01/01 01:13:34 |
2 |
|
3 |
Modified: monotone-0.36.initd |
4 |
Log: |
5 |
Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 386757. |
6 |
|
7 |
(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-vcs/monotone/files/monotone-0.36.initd |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: monotone-0.36.initd |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- monotone-0.36.initd 5 Mar 2010 16:49:36 -0000 1.1 |
23 |
+++ monotone-0.36.initd 1 Jan 2012 01:13:34 -0000 1.2 |
24 |
@@ -1,9 +1,9 @@ |
25 |
#!/sbin/runscript |
26 |
-# Copyright 2006 Gentoo Foundation |
27 |
+# Copyright 2006-2012 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License, v2 or later |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.1 2010/03/05 16:49:36 sping Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.2 2012/01/01 01:13:34 idl0r Exp $ |
31 |
|
32 |
-opts="import" |
33 |
+extra_commands="import" |
34 |
|
35 |
depend() { |
36 |
need net |
37 |
@@ -27,7 +27,7 @@ |
38 |
if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then |
39 |
ebegin "Creating monotone database" |
40 |
start-stop-daemon --start \ |
41 |
- --chuid ${MTN_USER}:${MTN_GROUP} \ |
42 |
+ --user ${MTN_USER} --group ${MTN_GROUP} \ |
43 |
--exec /usr/bin/mtn -- ${MTN_COMMON} db init |
44 |
eend $? |
45 |
fi |
46 |
@@ -36,9 +36,9 @@ |
47 |
export MTN_PWD=${RANDOM} |
48 |
yes "${MTN_PWD}" | \ |
49 |
start-stop-daemon --start \ |
50 |
- --chuid ${MTN_USER}:${MTN_GROUP} \ |
51 |
+ --user ${MTN_USER} --group ${MTN_GROUP} \ |
52 |
--exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY} |
53 |
- |
54 |
+ |
55 |
eend $? |
56 |
# Update the password lua hook |
57 |
cat > ${MTN_CONFDIR}/passphrase.lua <<EOF |
58 |
@@ -62,7 +62,7 @@ |
59 |
|
60 |
ebegin "Starting monotone server" |
61 |
start-stop-daemon --start --background \ |
62 |
- --chuid ${MTN_USER}:${MTN_GROUP} \ |
63 |
+ --user ${MTN_USER} --group ${MTN_GROUP} \ |
64 |
--exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \ |
65 |
--key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve |
66 |
eend $? |