OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Feb-2008 09:39:50
Branch: HEAD Handle: 2008022308394900
Modified files:
openpkg-src/squid rc.squid squid.spec
Log:
wait for Squid to shutdown properly (as it requires up to 30s on
average) in order to fix automatic restarting
Summary:
Revision Changes Path
1.19 +9 -1 openpkg-src/squid/rc.squid
1.123 +1 -1 openpkg-src/squid/squid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid/rc.squid
============================================================================
$ cvs diff -u -r1.18 -r1.19 rc.squid
--- openpkg-src/squid/rc.squid 25 Aug 2006 19:19:16 -0000 1.18
+++ openpkg-src/squid/rc.squid 23 Feb 2008 08:39:49 -0000 1.19
@@ -30,7 +30,15 @@
rcService squid enable yes || exit 0
rcService squid active no && exit 0
@l_prefix@/sbin/squid -k shutdown
- sleep 2
+ i=0
+ while [ $i -lt 40 ]; do
+ @l_prefix@/sbin/squid -k check 2>/dev/null
+ if [ $? -ne 0 ]; then
+ break
+ fi
+ sleep 1
+ i=`expr $i + 1`
+ done
%restart -u @l_susr@
rcService squid enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/squid.spec
============================================================================
$ cvs diff -u -r1.122 -r1.123 squid.spec
--- openpkg-src/squid/squid.spec 21 Feb 2008 07:12:42 -0000 1.122
+++ openpkg-src/squid/squid.spec 23 Feb 2008 08:39:49 -0000 1.123
@@ -37,7 +37,7 @@
Group: Web
License: GPL
Version: %{V_maj}.%{V_min}.%{V_rev}
-Release: 20080221
+Release: 20080223
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
