diff options
| author | Roman I Khimov <khimov@altell.ru> | 2010-07-28 13:13:24 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-07-29 21:24:59 +0400 |
| commit | 7e76202b53e756c560180b73bad64eb2426c64ae (patch) | |
| tree | 1907fbbf16f33b1ba42d692c68f78d0721ccc56b | |
| parent | 0b89ca3d10e2ac48f06eaddfa3ae8dace5e231c0 (diff) | |
squid: fix obsolete "-D" cli option warning for squid version 3
Signed-off-by: Roman I Khimov <khimov@altell.ru>
| -rw-r--r-- | recipes/squid/squid.inc | 2 | ||||
| -rw-r--r-- | recipes/squid/squid/squid.init | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc index 3355c2815a..477335b152 100644 --- a/recipes/squid/squid.inc +++ b/recipes/squid/squid.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more" LICENSE = "GPLv2" -INC_PR = "r9" +INC_PR = "r10" DEPENDS = "openssl openssl-native openldap" SQ_MAJ = "${@bb.data.getVar('PV',d,1).split('.')[0]}" diff --git a/recipes/squid/squid/squid.init b/recipes/squid/squid/squid.init index 4364f48f47..21ccf224e7 100644 --- a/recipes/squid/squid/squid.init +++ b/recipes/squid/squid/squid.init @@ -3,7 +3,13 @@ DAEMON=/usr/sbin/squid NAME=squid DESC="Squid HTTP proxy" PIDFILE=/var/run/squid.pid -SQUID_ARGS="-D -sY" + +# -D option is obsolete in squid version 3, so avoid warning +if $DAEMON -v | grep -q Version\ 3; then + SQUID_ARGS="-sY" +else + SQUID_ARGS="-D -sY" +fi test -f $DAEMON || exit 0 |