summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonny Davies <woodchip@gentoo.org>2002-02-08 09:58:06 +0000
committerDonny Davies <woodchip@gentoo.org>2002-02-08 09:58:06 +0000
commitfe4cc1a5aa226a75faa12af2639b0ab4b60dc39a (patch)
tree6e5d48b7e65e59dd28bb91a2733d3a5e5d02af62 /net-www/squid
parentinitial ebuild.. Our instant messenger section is starting to (diff)
downloadgentoo-2-fe4cc1a5aa226a75faa12af2639b0ab4b60dc39a.tar.gz
gentoo-2-fe4cc1a5aa226a75faa12af2639b0ab4b60dc39a.tar.bz2
gentoo-2-fe4cc1a5aa226a75faa12af2639b0ab4b60dc39a.zip
Tweak initscript. Squid takes a while to stop.
Diffstat (limited to 'net-www/squid')
-rw-r--r--net-www/squid/ChangeLog7
-rw-r--r--net-www/squid/files/squid.rc69
2 files changed, 10 insertions, 6 deletions
diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 59a39cb35073..af543b0cd055 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-www/squid
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.2 2002/02/08 09:58:06 woodchip Exp $
+
+ 8 Feb 2002; Donny Davies <woodchip@gentoo.org> files/squid.rc6 :
+
+ Squid is renowned for its inability to cleanly shutdown. Tried to make things
+ a little more friendly in that situation.
*squid-2.4.2s-r6 (1 Feb 2002)
diff --git a/net-www/squid/files/squid.rc6 b/net-www/squid/files/squid.rc6
index 2d7b9fda6729..cdb0fdac41e9 100644
--- a/net-www/squid/files/squid.rc6
+++ b/net-www/squid/files/squid.rc6
@@ -1,10 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $
-
-# Config is in /etc/conf.d/squid
-
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.4 2002/02/08 09:58:06 woodchip Exp $
depend() {
need net
@@ -51,11 +48,13 @@ start() {
checkconfig || return 1
ebegin "Starting squid"
start-stop-daemon --quiet --start --exec /usr/sbin/squid -- ${SQUID_OPTS}
+ sleep 1
eend $?
}
stop() {
ebegin "Stopping squid"
- start-stop-daemon --stop --quiet --pidfile /var/run/squid.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/squid.pid \
+ --retry -0/5/-0/5/-0/10/-0/10/-9/10
eend $?
}