[gentoo-commits] gentoo-x86 commit in net-misc/tor/files: tor.initd-r4

[Christian Faulhammer (fauli)]

fauli       09/09/07 11:23:31

  Modified:             tor.initd-r4
  Log:
  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)

Revision  Changes    Path
1.5                  net-misc/tor/files/tor.initd-r4

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/tor/files/tor.initd-r4?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/tor/files/tor.initd-r4?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/tor/files/tor.initd-r4?r1=1.4&r2=1.5

Index: tor.initd-r4
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tor.initd-r4	12 Jun 2009 01:02:47 -0000	1.4
+++ tor.initd-r4	7 Sep 2009 11:23:31 -0000	1.5
@@ -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 @@
 	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 $?
 }