diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2009-09-07 11:23:31 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2009-09-07 11:23:31 +0000 |
| commit | 8c200a8a7a70a87a13c69e5efc446771dbc050a3 (patch) | |
| tree | d04a3ada840f0917564b5d4e562626b5af3b9a99 /net-misc | |
| parent | texmacs-1.0.7.2 now does not contain the USE flag qt4, and should be stabiliz... (diff) | |
| download | gentoo-2-8c200a8a7a70a87a13c69e5efc446771dbc050a3.tar.gz gentoo-2-8c200a8a7a70a87a13c69e5efc446771dbc050a3.tar.bz2 gentoo-2-8c200a8a7a70a87a13c69e5efc446771dbc050a3.zip | |
respect CONFFILE variable in start calls, reported by Iome <frodone AT gmail DOT com> in bug 283524
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/tor/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/tor/files/tor.initd-r4 | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 824b9c8621ba..6a89a4661b44 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/tor # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.179 2009/08/17 19:42:11 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.180 2009/09/07 11:23:31 fauli Exp $ + + 07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4: + respect CONFFILE variable in start calls, reported by Iome <frodone AT + gmail DOT com> in bug 283524 *tor-0.2.1.19-r1 (17 Aug 2009) diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4 index 1eed94b5318b..24d8a9a610c1 100644 --- a/net-misc/tor/files/tor.initd-r4 +++ b/net-misc/tor/files/tor.initd-r4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.4 2009/06/12 01:02:47 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5 2009/09/07 11:23:31 fauli Exp $ opts="${opts} checkconfig reload" PIDFILE=/var/run/tor/tor.pid @@ -35,7 +35,7 @@ start() { checkconfig || return 1 ebegin "Starting Tor" HOME=/var/lib/tor - start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 + start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 eend $? } |