diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-08-05 09:30:34 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-08-05 09:30:34 +0000 |
| commit | 35d10edce7541e48829461b7402bf5c0ed89f1e5 (patch) | |
| tree | 985fbc7e8fef76ced4b7dc49f0529a2f94020a09 /net-ftp/pure-ftpd | |
| parent | EAPI3, apply conditional patch for sqlalchemy-0.7.1. Add post_inst message ab... (diff) | |
| download | gentoo-2-35d10edce7541e48829461b7402bf5c0ed89f1e5.tar.gz gentoo-2-35d10edce7541e48829461b7402bf5c0ed89f1e5.tar.bz2 gentoo-2-35d10edce7541e48829461b7402bf5c0ed89f1e5.zip | |
Removed --oknodo from rc10 init script
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pure-ftpd')
| -rw-r--r-- | net-ftp/pure-ftpd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd.rc10 | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog index 8a933f963107..ae33b22a8c2b 100644 --- a/net-ftp/pure-ftpd/ChangeLog +++ b/net-ftp/pure-ftpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-ftp/pure-ftpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.121 2011/08/02 15:13:19 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.122 2011/08/05 09:30:34 polynomial-c Exp $ + + 05 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> files/pure-ftpd.rc10: + Removed --oknodo from rc10 init script 02 Aug 2011; Markos Chandras <hwoarang@gentoo.org> pure-ftpd-1.0.32-r2.ebuild: diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc10 b/net-ftp/pure-ftpd/files/pure-ftpd.rc10 index 768c565efda6..961ce187402f 100644 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc10 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc10 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc10,v 1.1 2010/08/19 08:07:13 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc10,v 1.2 2011/08/05 09:30:34 polynomial-c Exp $ ftpd_pidfile="/var/run/pure-ftpd.pid" script_pidfile="/var/run/pure-uploadscript.pid" @@ -35,13 +35,11 @@ start() { fi UPSCRIPT="" - OKNODO="" if [ -n "$UPLOADSCRIPT" ] ; then UPSCRIPT="--uploadscript" - OKNODO="--oknodo" fi ebegin "Starting Pure-FTPd" - start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT + start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT result=$? if [ $result -ne 0 ] ; then eend 1 "Could not launch Pure-FTPd" |