Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 296864 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +8 lines)
Line  Link Here
0
-- temp/pure-ftpd.rc7
0
++ temp/pure-ftpd.rc7
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.1 2009/11/23 12:59:07 voyageur Exp $
4
# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.1 2009/11/23 12:59:07 voyageur Exp $
5
5
6
ftpd_pidifle="/var/run/pure-ftpd.pid"
7
script_pidfile="/var/run/pure-uploadscript.pid"
8
6
depend() {
9
depend() {
7
	need net
10
	need net
8
}
11
}
Lines 23-29 Link Here
23
		OKNODO="--oknodo"
26
		OKNODO="--oknodo"
24
	fi
27
	fi
25
	ebegin "Starting Pure-FTPd"
28
	ebegin "Starting Pure-FTPd"
26
	start-stop-daemon --start --quiet --pidfile /var/run/pure-ftpd.pid $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile /var/run/pure-ftpd.pid $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
29
	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
27
	result=$?
30
	result=$?
28
	if [ $result -ne 0 ] ; then
31
	if [ $result -ne 0 ] ; then
29
		eend 1 "Could not launch Pure-FTPd"
32
		eend 1 "Could not launch Pure-FTPd"
Lines 31-37 Link Here
31
		eend $result
34
		eend $result
32
		if [ -n "$UPLOADSCRIPT" ] ; then
35
		if [ -n "$UPLOADSCRIPT" ] ; then
33
			ebegin "Starting Pure-FTPd upload script"
36
			ebegin "Starting Pure-FTPd upload script"
34
			start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-uploadscript.pid --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
37
			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
35
			eend $?
38
			eend $?
36
		fi
39
		fi
37
	fi
40
	fi
Lines 39-49 Link Here
39
42
40
stop() {
43
stop() {
41
	ebegin "Stopping Pure-FTPd"
44
	ebegin "Stopping Pure-FTPd"
42
	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-ftpd.pid
45
	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
43
	eend $?
46
	eend $?
44
	if [ -n "$UPLOADSCRIPT" ] ; then
47
	if [ -n "$UPLOADSCRIPT" ] ; then
45
		ebegin "Stopping Pure-FTPd upload script"
48
		ebegin "Stopping Pure-FTPd upload script"
46
		start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-uploadscript.pid
49
		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
47
		eend $?
50
		eend $?
48
	fi
51
	fi
49
}
52
}

Return to bug 296864