Merge lp:~xnox/ubuntu/saucy/lxc-android-config/add-local-bridge into lp:ubuntu/saucy/lxc-android-config

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

'emits android' needs to be in etc/init/lxc-android-config.conf, not etc/init/upstart-local-bridge.conf.

review: Needs Fixing

[Oliver Grawert (ogra)]

looks fine, merged and uploaded

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-25 13:55:33 +0000
+++ debian/changelog	2013-08-27 10:10:50 +0000
@@ -1,3 +1,10 @@
+lxc-android-config (0.78) UNRELEASED; urgency=low
+
+  * add upstart-local-bridge, the ubuntu side of the events bridge to the
+    container.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 27 Aug 2013 11:08:14 +0100
+
 lxc-android-config (0.77) saucy; urgency=low
 
   * make sure the container is really up before starting to check for
 
=== modified file 'debian/control'
--- debian/control	2013-08-01 12:45:38 +0000
+++ debian/control	2013-08-27 10:10:50 +0000
@@ -8,7 +8,7 @@
 Package: lxc-android-config
 Architecture: all
 Multi-Arch: foreign
-Depends: lxc, cgroup-lite, debianutils, ${misc:Depends}
+Depends: lxc, cgroup-lite, debianutils, upstart (>= 1.10), ${misc:Depends}
 Recommends: ofono
 Description: configuration to fire up an ubuntu-touch android container
  This package contains the scripts to boot an Ubuntu Touch device.
 
=== added file 'etc/init/upstart-local-bridge.conf'
--- etc/init/upstart-local-bridge.conf	1970-01-01 00:00:00 +0000
+++ etc/init/upstart-local-bridge.conf	2013-08-27 10:10:50 +0000
@@ -0,0 +1,18 @@
+# upstart-local-bridge - Bridge client socket events into Upstart
+#
+# This helper daemon receives name=value pairs from a socket
+# and emits an upstart event containing these values.
+
+description	"Bridge client socket name=value pairs into Upstart"
+
+start on startup
+
+stop on runlevel [!2345]
+
+expect daemon
+respawn
+
+emits android-container
+emits android
+
+exec upstart-local-bridge --daemon --event=android-container --path=/dev/socket/upstart-text-bridge