Merge lp:~darkmuggle-deactivatedaccount/ubuntu/oneiric/squid/oneiric into lp:ubuntu/oneiric/squid

[Ben Howard]

Revert of r64 as regression to bug 561779

[Clint Byrum (clint-fewbar)]

Hi Ben, so I think we can actually keep your bug fix and the fix for 561779.

The start on should probably just be

start on runlevel [2345]

And thats *it*

The reason being that in oneiric, runlevel [2345] will not be reached until all static network interfaces are brought up.

I see no reason to try and start it every time a network interface comes up.. its either configured to listen on 0.0.0.0, or its not and the required interfaces are listed in /etc/network/interfaces.

Go ahead and change it to that, and I'll upload. Thanks!

review: Needs Fixing

[lp:~darkmuggle-deactivatedaccount/ubuntu/oneiric/squid/oneiric]

65. By Ben Howard on 2011-09-19

Complete revert of patch

[Ben Howard (darkmuggle-deactivatedaccount)]

Thanks Clint. I've uploaded a new diff with just runlevel [2345].

~Ben

On 09/19/2011 10:39 AM, Clint Byrum wrote:
> Review: Needs Fixing
>
> Hi Ben, so I think we can actually keep your bug fix and the fix for 561779.
>
> The start on should probably just be
>
> start on runlevel [2345]
>
> And thats *it*
>
> The reason being that in oneiric, runlevel [2345] will not be reached until all static network interfaces are brought up.
>
> I see no reason to try and start it every time a network interface comes up.. its either configured to listen on 0.0.0.0, or its not and the required interfaces are listed in /etc/network/interfaces.
>
> Go ahead and change it to that, and I'll upload. Thanks!
>
>

--

Ben Howard
<email address hidden>
Canonical USA, Inc
GPG ID 0x5406A866

[Clint Byrum (clint-fewbar)]

Thanks Ben! I fixed up the bug reference (seemed a typeo sent it off to a bug in glance), and uploaded. It should hit as "fix released" once beta2 freeze is over.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-06 12:12:53 +0000
+++ debian/changelog	2011-09-19 18:28:27 +0000
@@ -1,3 +1,11 @@
+squid (2.7.STABLE9-4ubuntu4) oneiric; urgency=low
+
+  * debian/squid.upstart:
+    - Revert "start after network and local file systems" as a regression
+      to (LP: #561779). (LP: #826798)
+
+ -- Ben Howard <[e-mail]>  Mon, 19 Sep 2011 12:17:51 -0600
+
 squid (2.7.STABLE9-4ubuntu3) oneiric; urgency=low
 
   * debian/squid.upstart: 

=== modified file 'debian/squid.upstart'
--- debian/squid.upstart	2011-09-06 12:12:53 +0000
+++ debian/squid.upstart	2011-09-19 18:28:27 +0000
@@ -6,7 +6,7 @@
 
 # The second "or" condition is to start squid in case it failed to start
 # because no real interface was there.
-start on runlevel [2345] and local-filesystems and net-device-up IFACE!=lo
+start on runlevel [2345]
 stop on runlevel [!2345]
 
 # Disable DNS checks so we can start squid