Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/pure-ftpd/files/
Date: Tue, 03 May 2016 09:47:44
Message-Id: 1462268837.2203781eaf654ffcbe0721d58703b51708eb3c87.polynomial-c@gentoo
1 commit: 2203781eaf654ffcbe0721d58703b51708eb3c87
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 09:23:32 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 09:47:17 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2203781e
7
8 net-ftp/pure-ftpd: Fixed openrc init script shebang.
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-ftp/pure-ftpd/files/pure-ftpd.rc11 | 8 +++-----
14 1 file changed, 3 insertions(+), 5 deletions(-)
15
16 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
17 index fe200cf..1e8722f 100644
18 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
19 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
20 @@ -1,5 +1,5 @@
21 -#!/sbin/runscript
22 -# Copyright 1999-2014 Gentoo Foundation
23 +#!/sbin/openrc-run
24 +# Copyright 1999-2016 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 # $Id$
27
28 @@ -13,7 +13,7 @@ depend() {
29 need net
30 }
31
32 -checkconfig() {
33 +start_pre() {
34 if [ -z "$IS_CONFIGURED" ] ; then
35 eerror "You need to setup /etc/conf.d/pure-ftpd first!"
36 return 1
37 @@ -21,8 +21,6 @@ checkconfig() {
38 }
39
40 start() {
41 - checkconfig || return 1
42 -
43 UPSCRIPT=""
44 if [ -n "$UPLOADSCRIPT" ] ; then
45 UPSCRIPT="--uploadscript"