* [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd.init
@ 2008-06-02 4:18 Jeremy Olexa (darkside)
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2008-06-02 4:18 UTC (permalink / raw
To: gentoo-commits
darkside 08/06/02 04:18:15
Modified: vsftpd.init
Log:
Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav Adamik for the suggestion, bug #223225
(Portage version: 2.1.4.4)
Revision Changes Path
1.6 net-ftp/vsftpd/files/vsftpd.init
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?r1=1.5&r2=1.6
Index: vsftpd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vsftpd.init 10 Apr 2007 13:00:55 -0000 1.5
+++ vsftpd.init 2 Jun 2008 04:18:15 -0000 1.6
@@ -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 @@
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/vsftpd \
- --pidfile "${VSFTPD_PID}"
+ start-stop-daemon --stop --exec /usr/sbin/vsftpd
eend $?
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd.init
@ 2008-12-26 16:50 Raul Porcel (armin76)
0 siblings, 0 replies; 3+ messages in thread
From: Raul Porcel (armin76) @ 2008-12-26 16:50 UTC (permalink / raw
To: gentoo-commits
armin76 08/12/26 16:50:16
Modified: vsftpd.init
Log:
Fix init script, bug 234278
(Portage version: 2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686)
Revision Changes Path
1.7 net-ftp/vsftpd/files/vsftpd.init
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?r1=1.6&r2=1.7
Index: vsftpd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vsftpd.init 2 Jun 2008 04:18:15 -0000 1.6
+++ vsftpd.init 26 Dec 2008 16:50:15 -0000 1.7
@@ -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.6 2008/06/02 04:18:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.7 2008/12/26 16:50:15 armin76 Exp $
VSFTPD_NAME=${SVCNAME##*.}
if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
@@ -12,6 +12,7 @@
VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf"
fi
VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}}
+VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd}
depend() {
need net
@@ -48,7 +49,7 @@
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/vsftpd \
+ start-stop-daemon --start --exec ${VSFTPD_EXEC} \
--background --make-pidfile --pidfile "${VSFTPD_PID}" \
-- "${VSFTPD_CONF}"
eend $?
@@ -56,7 +57,12 @@
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/vsftpd
+ if [ -f ${VSFTPD_PID} ]; then
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID}
+ else
+ ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the process name ${SVCNAME}"
+ start-stop-daemon --stop --name ${SVCNAME}
+ fi
eend $?
}
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd.init
@ 2015-01-31 13:07 Markos Chandras (hwoarang)
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2015-01-31 13:07 UTC (permalink / raw
To: gentoo-commits
hwoarang 15/01/31 13:07:47
Modified: vsftpd.init
Log:
Make sure child processes are killed properly. Bug #537290 by rhumbliner
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Revision Changes Path
1.9 net-ftp/vsftpd/files/vsftpd.init
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init?r1=1.8&r2=1.9
Index: vsftpd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vsftpd.init 20 Apr 2013 16:51:02 -0000 1.8
+++ vsftpd.init 31 Jan 2015 13:07:47 -0000 1.9
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.8 2013/04/20 16:51:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.9 2015/01/31 13:07:47 hwoarang Exp $
VSFTPD_NAME=${SVCNAME##*.}
if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
@@ -35,13 +35,17 @@
stop() {
ebegin "Stopping ${SVCNAME}"
+ local retval=0
if [ -f ${VSFTPD_PID} ]; then
- start-stop-daemon --stop --pidfile ${VSFTPD_PID}
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
+ pkill --full ${VSFTPD_CONF}
else
- ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the process name ${SVCNAME}"
- start-stop-daemon --stop --name ${SVCNAME}
+ ewarn "Couldn't find ${VSFTPD_PID} trying to stop using the config filename ${VSFTPD_CONF}"
+ pgrep --full ${VSFTPD_CONF} > ${VSFTPD_PID}
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
+ pkill --full ${VSFTPD_CONF}
fi
- eend $?
+ eend ${retval}
}
# vim: ts=4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-31 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-02 4:18 [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd.init Jeremy Olexa (darkside)
-- strict thread matches above, loose matches on Subject: below --
2008-12-26 16:50 Raul Porcel (armin76)
2015-01-31 13:07 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox