Merge lp:~xnox/ubuntu/wily/upstart/lp1447099 into lp:ubuntu/wily/upstart

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

Hi Dimitri,

Thanks for fixing this. Please could you simplify the test though - I think it's much clearer to avoid the "double-negative" and just write:

    test -d /run/systemd/system && { stop; exit 0; }

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-25 18:06:30 +0000
+++ debian/changelog	2015-05-16 19:44:02 +0000
@@ -1,8 +1,12 @@
 upstart (1.13.2-0ubuntu14) UNRELEASED; urgency=medium
 
+  [ James Hunt ]
   * Cherry-pick upstream fix for LP: #1447756, fixing broken handling
     when flushing logs to disk.
 
+  [ Dimitri John Ledkov ]
+  * Do not start upstart-event-bridge, if pid1 is systemd. (LP: #1447099)
+
  -- James Hunt <[e-mail]>  Fri, 24 Apr 2015 13:59:00 +0100
 
 upstart (1.13.2-0ubuntu13) vivid; urgency=medium
 
=== modified file 'extra/conf-session/upstart-event-bridge.conf'
--- extra/conf-session/upstart-event-bridge.conf	2013-07-18 14:12:13 +0000
+++ extra/conf-session/upstart-event-bridge.conf	2015-05-16 19:44:02 +0000
@@ -12,4 +12,9 @@
 
 respawn
 
+# Do not start, if pid1 is systemd LP: #1447099
+pre-start script
+	test ! -d /run/systemd/system || { stop; exit 0; }
+end script
+
 exec upstart-event-bridge