diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-04-10 13:00:55 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-04-10 13:00:55 +0000 |
| commit | 29dd75ab2749827397ef805fa9e75a0dae6f4720 (patch) | |
| tree | 33d7a40e6f7fa5a4f496df5d4aab84b9e053f936 /net-ftp/vsftpd/files | |
| parent | sparc stable (diff) | |
| download | historical-29dd75ab2749827397ef805fa9e75a0dae6f4720.tar.gz historical-29dd75ab2749827397ef805fa9e75a0dae6f4720.tar.bz2 historical-29dd75ab2749827397ef805fa9e75a0dae6f4720.zip | |
Fix the init script to muliplex better, #173923 thanks to Grégoire Baron
Package-Manager: portage-2.1.2.3
Diffstat (limited to 'net-ftp/vsftpd/files')
| -rw-r--r-- | net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 | 3 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd.init | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 new file mode 100644 index 000000000000..162037302490 --- /dev/null +++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 @@ -0,0 +1,3 @@ +MD5 146062e8b2f93af43ff6c2c770feea94 vsftpd-2.0.5.tar.gz 155985 +RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 vsftpd-2.0.5.tar.gz 155985 +SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b vsftpd-2.0.5.tar.gz 155985 diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init index 24deb9cd36a8..591679fd038e 100644 --- a/net-ftp/vsftpd/files/vsftpd.init +++ b/net-ftp/vsftpd/files/vsftpd.init @@ -1,15 +1,17 @@ #!/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.4 2007/04/02 11:32:33 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.5 2007/04/10 13:00:55 uberlord Exp $ -VSFTPD_CONF=${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf} VSFTPD_NAME=${SVCNAME##*.} if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid" + VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf" else VSFTPD_PID="/var/run/vsftpd.pid" + VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf" fi +VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}} depend() { need net @@ -45,7 +47,7 @@ checkconfig() { start() { checkconfig || return 1 - ebegin "Starting vsftpd" + ebegin "Starting ${SVCNAME}" start-stop-daemon --start --exec /usr/sbin/vsftpd \ --background --make-pidfile --pidfile "${VSFTPD_PID}" \ -- "${VSFTPD_CONF}" @@ -53,7 +55,7 @@ start() { } stop() { - ebegin "Stopping vsftpd" + ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --exec /usr/sbin/vsftpd \ --pidfile "${VSFTPD_PID}" eend $? |