summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2007-06-29 17:20:53 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:18 +0100
commit5fc105f88a80b2bcd9df0831c029d33392bca236 (patch)
tree6bb33381a128d6ce8393c8087606727df0346d42
parentec8e7f5b28e3bc27fc7443428eaffd67d741d573 (diff)
downloadapache2-5fc105f88a80b2bcd9df0831c029d33392bca236.tar.gz
Display warning when NO_START=1 even with VERBOSE=no
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@397 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/apache2.2-common.init.d2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/apache2.2-common.init.d b/debian/apache2.2-common.init.d
index 5726d823..f48d07e6 100644
--- a/debian/apache2.2-common.init.d
+++ b/debian/apache2.2-common.init.d
@@ -25,7 +25,7 @@ fi
test -f /etc/default/rcS && . /etc/default/rcS
test -f /etc/default/apache2 && . /etc/default/apache2
if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
- [ "$VERBOSE" != no ] && log_warning_msg "Not starting apache2 - edit /etc/default/apache2 and change NO_START to be 0.";
+ log_warning_msg "Not starting apache2 - edit /etc/default/apache2 and change NO_START to be 0.";
exit 0;
fi
diff --git a/debian/changelog b/debian/changelog
index eb493e30..4527c0ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ apache2 (2.2.3-4+etch2) UNRELEASED; urgency=low
* Fix regression breaking /etc/init.d/apache when /bin/sh is not bash
(Closes: #430386)
* Only allow group www-data to execute suexec (Closes: #431048)
+ * Display warning when NO_START=1 even with VERBOSE=no, to avoid
+ confusion (Closes: #430116)
-- Stefan Fritsch <sf@debian.org> Sat, 23 Jun 2007 10:18:12 +0200