Merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs into lp:ubuntu/natty/squid-deb-proxy

Proposed by Clint Byrum on 2010-11-19
Status: Merged
Merged at revision: 6
Proposed branch: lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs
Merge into: lp:ubuntu/natty/squid-deb-proxy
Diff against target: 52 lines (+13/-4)
3 files modified
debian/changelog (+9/-0)
debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart (+2/-2)
debian/squid-deb-proxy.upstart (+2/-2)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs
Reviewer Review Type Date Requested Status
Bilal Akhtar (community) 2010-11-19 Approve on 2010-11-20
Ubuntu branches 2010-11-19 Pending
Review via email: mp+41256@code.launchpad.net

Description of the change

Fixes problems with boxes on wifi and restarting squid-deb-proxy.

To post a comment you must log in.
Bilal Akhtar (bilalakhtar) :
review: Approve

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-11-10 10:45:49 +0000
3+++ debian/changelog 2010-11-19 00:54:09 +0000
4@@ -1,3 +1,12 @@
5+squid-deb-proxy (0.3.3) natty; urgency=low
6+
7+ * Adjusting upstart job so restarting squid-deb-proxy does not result
8+ in killing squid-deb-proxy-avahi. (LP: #677276)
9+ * Also adjusting upstart job so squid-deb-proxy does not get started
10+ a real network interface is up and all local filesystems are mounted
11+
12+ -- Clint Byrum <clint@ubuntu.com> Thu, 18 Nov 2010 16:27:24 -0800
13+
14 squid-deb-proxy (0.3.2) natty; urgency=low
15
16 [ Colin Dean ]
17
18=== modified file 'debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart'
19--- debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart 2010-11-10 10:45:49 +0000
20+++ debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart 2010-11-19 00:54:09 +0000
21@@ -4,7 +4,7 @@
22 description "squid-deb-proxy-avahi"
23
24 start on (started squid-deb-proxy and started avahi-daemon)
25-stop on stopping squid-deb-proxy
26+stop on stopped squid-deb-proxy
27
28 # get it back with
29 # avahi-browse -prt _apt_proxy._tcp
30@@ -13,4 +13,4 @@
31 if [ -n "$PORT" ] && [ -x /usr/bin/avahi-publish ]; then
32 exec avahi-publish -s "Squid deb proxy" _apt_proxy._tcp $PORT
33 fi
34-end script
35\ No newline at end of file
36+end script
37
38=== modified file 'debian/squid-deb-proxy.upstart'
39--- debian/squid-deb-proxy.upstart 2010-01-26 09:19:50 +0000
40+++ debian/squid-deb-proxy.upstart 2010-11-19 00:54:09 +0000
41@@ -11,8 +11,8 @@
42 fi
43 end script
44
45-start on runlevel [2345]
46+start on (local-filesystems and net-device-up IFACE!=lo)
47 stop on runlevel [!2345]
48
49 expect fork
50-exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf
51\ No newline at end of file
52+exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf

Subscribers

People subscribed via source and target branches

to all changes: