summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp/vsftpd/files/vsftpd.init.d')
-rw-r--r--net-ftp/vsftpd/files/vsftpd.init.d13
1 files changed, 6 insertions, 7 deletions
diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d
index 3ac01e6a5221..5f1c4ca527e9 100644
--- a/net-ftp/vsftpd/files/vsftpd.init.d
+++ b/net-ftp/vsftpd/files/vsftpd.init.d
@@ -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.d,v 1.3 2004/07/14 23:44:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.4 2004/10/01 03:16:13 jforman Exp $
depend() {
need net
@@ -14,12 +14,11 @@ checkconfig() {
eerror "There are sample configurations in /usr/share/doc/vsftpd"
return 1
else
- source ${VSFTPD_CONF}
- if [ "${background}" != "YES" ] || [ "${listen}" != "YES" ] ; then
- eerror "${VSFTPD_CONF} must contain background=YES and listen=YES"
- eerror "in order to start vsftpd from /etc/init.d/vsftpd"
- return 2
- fi
+ ( grep -q "^background=YES" ${VSFTPD_CONF} && grep -q "^listen=YES" ${VSFTPD_CONF} ) || {
+ eerror "${VSFTPD_CONF} must contain background=YES and listen=YES"
+ eerror "in order to start vsftpd from /etc/init.d/vsftpd"
+ return 2
+ }
fi
}