Ubuntu
lxc-android-config package

Merge lp:~sergiusens/ubuntu/saucy/lxc-android-config/localbridge into lp:ubuntu/saucy/lxc-android-config

  1. Saucy (13.10)
  2. localbridge
  3. Merge into saucy
Proposed by Sergio Schvezov
Status: Merged
Merge reported by: Oliver Grawert
Merged at revision: not available
Proposed branch: lp:~sergiusens/ubuntu/saucy/lxc-android-config/localbridge
Merge into: lp:ubuntu/saucy/lxc-android-config
Diff against target: 26 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
etc/init/upstart-local-bridge.conf (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu/saucy/lxc-android-config/localbridge
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+186325@code.launchpad.net

Description of the change

At the current event it was being triggered the bridge didn't load.

To post a comment you must log in.

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 2013-09-17 21:05:16 +0000
3+++ debian/changelog 2013-09-18 13:59:59 +0000
4@@ -1,3 +1,10 @@
5+lxc-android-config (0.99) UNRELEASED; urgency=low
6+
7+ * upstart-local-bridge was starting too early, waiting for the filesystem
8+ event instead of just on startup.
9+
10+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 18 Sep 2013 10:50:45 -0300
11+
12 lxc-android-config (0.98) saucy; urgency=low
13
14 * rervert to the old way of disabling adbd inside the android container by
15
16=== modified file 'etc/init/upstart-local-bridge.conf'
17--- etc/init/upstart-local-bridge.conf 2013-08-27 12:38:24 +0000
18+++ etc/init/upstart-local-bridge.conf 2013-09-18 13:59:59 +0000
19@@ -5,7 +5,7 @@
20
21 description "Bridge client socket name=value pairs into Upstart"
22
23-start on startup
24+start on filesystem
25
26 stop on runlevel [!2345]
27

Subscribers

People subscribed via source and target branches