commit: 9725bbb3a9b403c37dbf64c73428d8074112a471 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Apr 28 10:58:01 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Apr 28 10:58:01 2019 +0000 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=9725bbb3
apache2ctl: Minor improvements Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> 2.4/scripts/apache2ctl | 5 ++--- 1 file 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"