[oe-commits] Roman I Khimov : squid: fix missing /etc/squid.conf message from init

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0b89ca3d10e2ac48f06eaddfa3ae8dace5e231c0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0b89ca3d10e2ac48f06eaddfa3ae8dace5e231c0

Author: Roman I Khimov <khimov at altell.ru>
Date:   Wed Jul 28 13:09:12 2010 +0400

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 at altell.ru>

---

 recipes/squid/squid.inc        |    2 +-
 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 eb567c8..3355c28 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 d829cf9..4364f48 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;