diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2008-06-02 04:18:15 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2008-06-02 04:18:15 +0000 |
commit | 6deb010c4596b845828fcb9e4220d8a57fbf0118 (patch) | |
tree | f7677be860d30b7bd86191ae6019abefaf2be643 /net-ftp | |
parent | Stable for HPPA (bug #223965). (diff) | |
download | gentoo-2-6deb010c4596b845828fcb9e4220d8a57fbf0118.tar.gz gentoo-2-6deb010c4596b845828fcb9e4220d8a57fbf0118.tar.bz2 gentoo-2-6deb010c4596b845828fcb9e4220d8a57fbf0118.zip |
Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav Adamik for the suggestion, bug #223225
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-ftp')
-rw-r--r-- | net-ftp/vsftpd/ChangeLog | 6 | ||||
-rw-r--r-- | net-ftp/vsftpd/files/vsftpd.init | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 5599491b98c8..9ccc54c82d54 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/vsftpd # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.98 2008/05/14 22:12:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.99 2008/06/02 04:18:14 darkside Exp $ + + 02 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/vsftpd.init: + Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav + Adamik for the suggestion, bug #223225 14 May 2008; Diego Pettenò <flameeyes@gentoo.org> vsftpd-2.0.5-r3.ebuild, vsftpd-2.0.6.ebuild: diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init index 591679fd038e..8e280817bd98 100644 --- a/net-ftp/vsftpd/files/vsftpd.init +++ b/net-ftp/vsftpd/files/vsftpd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.5 2007/04/10 13:00:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.6 2008/06/02 04:18:15 darkside Exp $ VSFTPD_NAME=${SVCNAME##*.} if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then @@ -56,8 +56,7 @@ start() { stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/vsftpd \ - --pidfile "${VSFTPD_PID}" + start-stop-daemon --stop --exec /usr/sbin/vsftpd eend $? } |