Merge lp:~clint-fewbar/ubuntu/lucid/squid-deb-proxy/no-expect-fork into lp:ubuntu/lucid/squid-deb-proxy

Proposed by Clint Byrum on 2011-01-11
Status: Needs review
Proposed branch: lp:~clint-fewbar/ubuntu/lucid/squid-deb-proxy/no-expect-fork
Merge into: lp:ubuntu/lucid/squid-deb-proxy
Diff against target: 26 lines (+8/-2)
2 files modified
debian/changelog (+7/-0)
debian/squid-deb-proxy.upstart (+1/-2)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/lucid/squid-deb-proxy/no-expect-fork
Reviewer Review Type Date Requested Status
Micah Gersten 2011-01-11 Needs Fixing on 2011-01-16
Review via email: mp+45934@code.launchpad.net

Description of the change

Same fix as was applied to squid's main upstart job

To post a comment you must log in.
Micah Gersten (micahg) wrote :

There's already a version in lucid-proposed, so this should be rebased on top of that.

review: Needs Fixing

Unmerged revisions

5. By Clint Byrum on 2011-01-11

Removing expect fork and passing -N to squid to prevent upstart
losing track of squid on reload (LP: #573853)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-18 15:05:12 +0000
3+++ debian/changelog 2011-01-11 23:27:11 +0000
4@@ -1,3 +1,10 @@
5+squid-deb-proxy (0.3.1-0ubuntu0.1) lucid-proposed; urgency=low
6+
7+ * Removing expect fork and passing -N to squid to prevent upstart
8+ losing track of squid on reload (LP: #573853)
9+
10+ -- Clint Byrum <clint@ubuntu.com> Tue, 11 Jan 2011 15:07:37 -0800
11+
12 squid-deb-proxy (0.3.1) lucid; urgency=low
13
14 * debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart:
15
16=== modified file 'debian/squid-deb-proxy.upstart'
17--- debian/squid-deb-proxy.upstart 2010-01-26 09:19:50 +0000
18+++ debian/squid-deb-proxy.upstart 2011-01-11 23:27:11 +0000
19@@ -14,5 +14,4 @@
20 start on runlevel [2345]
21 stop on runlevel [!2345]
22
23-expect fork
24-exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf
25\ No newline at end of file
26+exec squid -N -f /etc/squid-deb-proxy/squid-deb-proxy.conf

Subscribers

People subscribed via source and target branches

to all changes: