aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2011-11-08 14:40:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-09 07:14:46 +0000
commitcc7d0877ab9515aae176d442b2d03703ab54b4a9 (patch)
tree3109fdc25e4181a0a319ea0b3d0a5fc084bfc9dc /main
parent3b9d1b7ca53adbc49f99d270cd94de65fbafda70 (diff)
downloadaports-cc7d0877ab9515aae176d442b2d03703ab54b4a9.tar.bz2
aports-cc7d0877ab9515aae176d442b2d03703ab54b4a9.tar.xz
squid: Removing deprecated -D option
Diffstat (limited to 'main')
-rw-r--r--main/squid/squid.confd2
-rw-r--r--main/squid/squid.initd2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/squid/squid.confd b/main/squid/squid.confd
index 14a9ee84bd..e523123d53 100644
--- a/main/squid/squid.confd
+++ b/main/squid/squid.confd
@@ -4,7 +4,7 @@
# Config file for /etc/init.d/squid
-SQUID_OPTS="-DYC"
+SQUID_OPTS="-YC"
# Max. number of filedescriptors to use. You can increase this on a busy
# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024.
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index 2eaf1dd2af..e243ddd50c 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -37,7 +37,7 @@ checkconfig() {
ebegin "Initializing cache directories"
local ORIG_UMASK=$(umask)
umask 027
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -D 2>&1)"
+ local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N 2>&1)"
if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
umask $ORIG_UMASK
eend 1