Merge lp:~vorlon/upstart/lp.1235387 into lp:upstart

Proposed by Steve Langasek on 2013-10-04
Status: Merged
Merged at revision: 1547
Proposed branch: lp:~vorlon/upstart/lp.1235387
Merge into: lp:upstart
Diff against target: 25 lines (+7/-1)
2 files modified
ChangeLog (+6/-0)
extra/conf/upstart-file-bridge.conf (+1/-1)
To merge this branch: bzr merge lp:~vorlon/upstart/lp.1235387
Reviewer Review Type Date Requested Status
James Hunt 2013-10-04 Approve on 2013-10-28
Review via email: mp+189399@code.launchpad.net

Description of the change

On touch, apport is not reliably submitting crash reports. It appears the
file bridge's start condition is wrong.

To post a comment you must log in.
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-10-04 12:33:07 +0000
3+++ ChangeLog 2013-10-04 18:27:50 +0000
4@@ -1,3 +1,9 @@
5+2013-10-04 Steve Langasek <steve.langasek@ubuntu.com>
6+
7+ * extra/conf/upstart-file-bridge.conf: fix the start condition to
8+ comply with the intent, that we start the file bridge only once
9+ the filesystem is up. (LP: #1235387)
10+
11 2013-10-04 James Hunt <james.hunt@ubuntu.com>
12
13 * extra/upstart-local-bridge.c:
14
15=== modified file 'extra/conf/upstart-file-bridge.conf'
16--- extra/conf/upstart-file-bridge.conf 2013-03-15 12:51:25 +0000
17+++ extra/conf/upstart-file-bridge.conf 2013-10-04 18:27:50 +0000
18@@ -9,7 +9,7 @@
19
20 # the bridge does not currently handle dealing with mounts that overlay
21 # already-watched directories.
22-start on mounted
23+start on filesystem
24
25 stop on runlevel [!2345]
26

Subscribers

People subscribed via source and target branches