1 |
mrness 08/04/14 05:45:07 |
2 |
|
3 |
Modified: squid.initd-logrotate squid.initd |
4 |
Log: |
5 |
Fix init script (#217455). |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 net-proxy/squid/files/squid.initd-logrotate |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: squid.initd-logrotate |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -u -r1.6 -r1.7 |
21 |
--- squid.initd-logrotate 13 Apr 2008 13:33:13 -0000 1.6 |
22 |
+++ squid.initd-logrotate 14 Apr 2008 05:45:06 -0000 1.7 |
23 |
@@ -1,7 +1,7 @@ |
24 |
#!/sbin/runscript |
25 |
# Copyright 1999-2006 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.6 2008/04/13 13:33:13 mrness Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.7 2008/04/14 05:45:06 mrness Exp $ |
29 |
|
30 |
opts="${opts} reload" |
31 |
|
32 |
@@ -25,7 +25,7 @@ |
33 |
checkconfig() { |
34 |
maxfds |
35 |
|
36 |
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf) |
37 |
+ local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/squid.conf) |
38 |
[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" |
39 |
|
40 |
local x |
41 |
|
42 |
|
43 |
|
44 |
1.9 net-proxy/squid/files/squid.initd |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.9&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?rev=1.9&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid.initd?r1=1.8&r2=1.9 |
49 |
|
50 |
Index: squid.initd |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v |
53 |
retrieving revision 1.8 |
54 |
retrieving revision 1.9 |
55 |
diff -u -r1.8 -r1.9 |
56 |
--- squid.initd 13 Apr 2008 13:33:13 -0000 1.8 |
57 |
+++ squid.initd 14 Apr 2008 05:45:06 -0000 1.9 |
58 |
@@ -1,7 +1,7 @@ |
59 |
#!/sbin/runscript |
60 |
# Copyright 1999-2006 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.8 2008/04/13 13:33:13 mrness Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.9 2008/04/14 05:45:06 mrness Exp $ |
64 |
|
65 |
opts="${opts} reload rotate" |
66 |
|
67 |
@@ -25,7 +25,7 @@ |
68 |
checkconfig() { |
69 |
maxfds |
70 |
|
71 |
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf) |
72 |
+ local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/squid.conf) |
73 |
[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" |
74 |
|
75 |
local x |
76 |
|
77 |
|
78 |
|
79 |
-- |
80 |
gentoo-commits@l.g.o mailing list |