diff options
| author | Roman I Khimov <khimov@altell.ru> | 2010-07-28 13:09:12 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-07-29 21:24:59 +0400 |
| commit | 0b89ca3d10e2ac48f06eaddfa3ae8dace5e231c0 (patch) | |
| tree | 660840b2e8840cf926eec848f40165676db8295b | |
| parent | dc009cff04e3ffe9339e6bbe5fb30c91841b40f0 (diff) | |
squid: fix missing /etc/squid.conf message from init
Like this:
/etc/init.d/squid: line 18: /etc/squid.conf: No such file or directory
We actually have squid config in /etc/squid/squid.conf
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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc index eb567c888c..3355c2815a 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 = "r8" +INC_PR = "r9" 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 d829cf90b9..4364f48f47 100644 --- a/recipes/squid/squid/squid.init +++ b/recipes/squid/squid/squid.init @@ -9,7 +9,7 @@ test -f $DAEMON || exit 0 grepconf() { w=" " # space tab - sq=/etc/$NAME.conf + sq=/etc/$NAME/$NAME.conf # sed is cool. res=`sed -ne ' s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p; |