summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-04-28 12:58:01 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-04-28 12:58:01 +0200
commit9725bbb3a9b403c37dbf64c73428d8074112a471 (patch)
tree577d2ba69b1eacabcea31afd4047e29b80697735 /2.4/scripts/apache2ctl
parentSeveral fixes to previous apache2ctl systemd enhancement (diff)
downloadapache-master.tar.gz
apache-master.tar.bz2
apache-master.zip
apache2ctl: Minor improvementsHEADmaster
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to '2.4/scripts/apache2ctl')
-rw-r--r--2.4/scripts/apache2ctl5
1 files changed, 2 insertions, 3 deletions
diff --git a/2.4/scripts/apache2ctl b/2.4/scripts/apache2ctl
index 55975d4..872044b 100644
--- a/2.4/scripts/apache2ctl
+++ b/2.4/scripts/apache2ctl
@@ -8,7 +8,7 @@ RC_VERBS="start stop restart checkconfd configtest modules virtualhosts configdu
is_systemd() {
- [ $(ps -o comm= 1) = "systemd" ] && return 0
+ [ $(ps -o comm= -p 1) = "systemd" ] && return 0
return 1
}
@@ -109,8 +109,7 @@ else
# Append the server root and configuration file parameters to the
# user's APACHE2_OPTS.
- APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
- APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
+ APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT} -f ${CONFIGFILE}"
apache_service="apache2.service"