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

[Steve Langasek]

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

[James Hunt (jamesodhunt)]

LGTM.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-10-04 12:33:07 +0000
+++ ChangeLog	2013-10-04 18:27:50 +0000
@@ -1,3 +1,9 @@
[phone]  Steve Langasek  <[e-mail]>
+
+	* extra/conf/upstart-file-bridge.conf: fix the start condition to
+	  comply with the intent, that we start the file bridge only once
+	  the filesystem is up. (LP: #1235387)
+
 2013-10-04  James Hunt  <[e-mail]>
 
 	* extra/upstart-local-bridge.c:
 
=== modified file 'extra/conf/upstart-file-bridge.conf'
--- extra/conf/upstart-file-bridge.conf	2013-03-15 12:51:25 +0000
+++ extra/conf/upstart-file-bridge.conf	2013-10-04 18:27:50 +0000
@@ -9,7 +9,7 @@
 
 # the bridge does not currently handle dealing with mounts that overlay
 # already-watched directories.
-start on mounted
+start on filesystem
 
 stop on runlevel [!2345]