summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2013-05-30 14:46:14 +0200
committerStefan Fritsch <sf@sfritsch.de>2013-05-30 14:46:14 +0200
commit6bea7dc421102d2508d8f9ee3c7944e667b32632 (patch)
treefe25ed284dc5ca66873a4669ee8f45a05788cd22
parentbdf5d1a0f635d46c4b437a83f26b38b84e42f40b (diff)
downloadapache2-6bea7dc421102d2508d8f9ee3c7944e667b32632.tar.gz
Don't source /lib/init/vars.sh in init script
new lintian claims that we should not do that. And we only need VERBOSE anyway.
-rwxr-xr-xdebian/apache2.init6
-rw-r--r--debian/changelog1
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/apache2.init b/debian/apache2.init
index ec100098..90eefee9 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -64,8 +64,10 @@ fi
PIDFILE=$(. $APACHE_ENVVARS && echo $APACHE_PID_FILE)
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
+VERBOSE=no
+if [ -f /etc/default/rcS ]; then
+ . /etc/default/rcS
+fi
. /lib/lsb/init-functions
diff --git a/debian/changelog b/debian/changelog
index 8feedd8b..6fa2588c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apache2 (2.4.4-4) UNRELEASED; urgency=low
* Fix some lintian warnings:
- fix pod error
- add overrides for hardening-no-fortify-functions
+ - don't use /lib/init/vars.sh in init script
[ Arno Töll ]
* Correct maintainer scripts by removing forgotten left-overs of our Squeeze