| 1 |
commit: 9725bbb3a9b403c37dbf64c73428d8074112a471 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 28 10:58:01 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 28 10:58:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=9725bbb3 |
| 7 |
|
| 8 |
apache2ctl: Minor improvements |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
2.4/scripts/apache2ctl | 5 ++--- |
| 13 |
1 file changed, 2 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/2.4/scripts/apache2ctl b/2.4/scripts/apache2ctl |
| 16 |
index 55975d4..872044b 100644 |
| 17 |
--- a/2.4/scripts/apache2ctl |
| 18 |
+++ b/2.4/scripts/apache2ctl |
| 19 |
@@ -8,7 +8,7 @@ RC_VERBS="start stop restart checkconfd configtest modules virtualhosts configdu |
| 20 |
|
| 21 |
|
| 22 |
is_systemd() { |
| 23 |
- [ $(ps -o comm= 1) = "systemd" ] && return 0 |
| 24 |
+ [ $(ps -o comm= -p 1) = "systemd" ] && return 0 |
| 25 |
return 1 |
| 26 |
} |
| 27 |
|
| 28 |
@@ -109,8 +109,7 @@ else |
| 29 |
|
| 30 |
# Append the server root and configuration file parameters to the |
| 31 |
# user's APACHE2_OPTS. |
| 32 |
- APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}" |
| 33 |
- APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}" |
| 34 |
+ APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT} -f ${CONFIGFILE}" |
| 35 |
|
| 36 |
apache_service="apache2.service" |
Archives