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: Wed, 30 Dec 2020 01:32:39
Message-Id: 1609291774.348521816ac865188a12f03b059d5463fe1f441e.polynomial-c@gentoo
1 commit: 348521816ac865188a12f03b059d5463fe1f441e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 30 01:29:34 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 30 01:29:34 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=34852181
7
8 2.4/init: Submit pidfile to s-s-d on start to not confuse status
9
10 Reported-by: Hank Leininger <hlein <AT> korelogic.com>
11 Bug: https://bugs.gentoo.org/762481
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 2.4/init/apache2.initd | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
18 index 77e9e36..fc09ddd 100755
19 --- a/2.4/init/apache2.initd
20 +++ b/2.4/init/apache2.initd
21 @@ -92,7 +92,8 @@ start() {
22
23 ebegin "Starting ${SVCNAME}"
24 # Use start stop daemon to apply system limits #347301
25 - start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
26 + start-stop-daemon --start --pidfile "${PIDFILE}" -- \
27 + ${APACHE2} ${APACHE2_OPTS} -k start
28
29 local i=0 retval=1
30 while [ $i -lt ${TIMEOUT} ] ; do