Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/apache:master commit in: 2.4/init/
Date: Thu, 03 Mar 2016 13:03:23
Message-Id: 1457009186.35d9a0af9ed1c4e9abe21fc9a2e47576ff6458a3.polynomial-c@gentoo
1 commit: 35d9a0af9ed1c4e9abe21fc9a2e47576ff6458a3
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 21 13:14:45 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 3 12:46:26 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=35d9a0af
7
8 apache2.initd: remove ancient baselayout-1.x check in checkconfd().
9
10 OpenRC went stable on 2011-06-28, and support for baselayout-1.x died
11 off after that. It's been ~4.5 years, so I think this check can go.
12
13 2.4/init/apache2.initd | 6 ------
14 1 file changed, 6 deletions(-)
15
16 diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
17 index 23d1746..88d9dd0 100755
18 --- a/2.4/init/apache2.initd
19 +++ b/2.4/init/apache2.initd
20 @@ -28,12 +28,6 @@ configtest() {
21 }
22
23 checkconfd() {
24 - if [ ! -f /etc/init.d/sysfs ]; then
25 - eerror "This init script works only with openrc (baselayout-2)."
26 - eerror "If you still need baselayout-1.x, please, use"
27 - eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/"
28 - fi
29 -
30 PIDFILE="${PIDFILE:-/var/run/apache2.pid}"
31 TIMEOUT=${TIMEOUT:-15}