| 1 |
voyageur 10/07/29 21:50:32 |
| 2 |
|
| 3 |
Modified: proftpd.initd |
| 4 |
Log: |
| 5 |
Version bump and fix quiet mode in init script, thanks Lommerzheim <bernd@×××××××××××.com>, bugs #314055 and #330253 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-ftp/proftpd/files/proftpd.initd |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd.initd?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd.initd?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd.initd?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: proftpd.initd |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- proftpd.initd 17 Feb 2010 12:28:25 -0000 1.1 |
| 22 |
+++ proftpd.initd 29 Jul 2010 21:50:32 -0000 1.2 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.1 2010/02/17 12:28:25 voyageur Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.2 2010/07/29 21:50:32 voyageur Exp $ |
| 29 |
|
| 30 |
opts="reload" |
| 31 |
|
| 32 |
@@ -16,9 +16,13 @@ |
| 33 |
eerror "file. In /etc/proftpd you can find a sample configuration." |
| 34 |
return 1 |
| 35 |
fi |
| 36 |
- ebegin "Checking ProFTPD configuration" |
| 37 |
- /usr/sbin/proftpd -t |
| 38 |
- eend $? "A configuration error was found. You have to fix your configuration file." |
| 39 |
+ /usr/sbin/proftpd -t &>/dev/null |
| 40 |
+ if [ $? -ne 0 ] ; then |
| 41 |
+ eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to" |
| 42 |
+ eerror "fix your configuration in order to run the ProFTPD server. For more information" |
| 43 |
+ eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'." |
| 44 |
+ return 2 |
| 45 |
+ fi |
| 46 |
} |
| 47 |
|
| 48 |
start() { |
Archives