[gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd.init

[Raul Porcel (armin76)]

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 $?
 }