[gentoo-commits] proj/apache:master commit in: 2.4/init/

[Lars Wendler]

commit:     889c598ac4275caf37f2f9473f6947b4b4d7c0fe
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 15:25:46 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 12:46:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=889c598a

apache2.initd: set the path to the apache2 binary once, globally.

The $APACHE2 variable (containing the path to apache2) is currently
set every time checkconfd() is called. Its value never changes, and
the variable is already global, so we might as well set it once at the
beginning of the script.

 2.4/init/apache2.initd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index 50b6500..c9d12c7 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -22,6 +22,9 @@ SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
 CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
 RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
 
+# The path to the apache2 binary.
+APACHE2="/usr/sbin/apache2"
+
 depend() {
        need net
        use mysql dns logger netmount postgresql
@@ -44,7 +47,6 @@ checkconfd() {
        APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
        [ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E 
${STARTUPERRORLOG}"
 
-       APACHE2="/usr/sbin/apache2"
 }
 
 checkconfig() {