Ubuntu
lxc-android-config package

Merge lp:~sergiusens/ubuntu/saucy/lxc-android-config/sync-bridge-and-android into lp:ubuntu/saucy/lxc-android-config

  1. Saucy (13.10)
  2. sync-bridge-and-android
  3. Merge into saucy
Proposed by Sergio Schvezov
Status: Merged
Merged at revision: 106
Proposed branch: lp:~sergiusens/ubuntu/saucy/lxc-android-config/sync-bridge-and-android
Merge into: lp:ubuntu/saucy/lxc-android-config
Diff against target: 48 lines (+13/-3)
3 files modified
debian/changelog (+8/-0)
etc/init/upstart-local-bridge.conf (+5/-2)
var/lib/lxc/android/pre-start.sh (+0/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu/saucy/lxc-android-config/sync-bridge-and-android
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
Review via email: mp+188931@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Looks good, tested and works as expected.

Just need to coordinate the landing, even if a bugfix.

review: Approve

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-30 13:31:37 +0000
3+++ debian/changelog 2013-10-02 21:34:25 +0000
4@@ -1,3 +1,11 @@
5+lxc-android-config (0.105) UNRELEASED; urgency=low
6+
7+ * Creating /dev/socket in upstart-local-bridge.
8+ * upstart-local-bridge job to start before lxc-android-config.
9+ * removing the deletion of /dev/socket in the lxc pre start script.
10+
11+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 02 Oct 2013 18:27:15 -0300
12+
13 lxc-android-config (0.104) saucy; urgency=low
14
15 * Make /etc/writable "synced" and drop the entries that got moved in there.
16
17=== modified file 'etc/init/upstart-local-bridge.conf'
18--- etc/init/upstart-local-bridge.conf 2013-09-18 10:50:45 +0000
19+++ etc/init/upstart-local-bridge.conf 2013-10-02 21:34:25 +0000
20@@ -5,7 +5,7 @@
21
22 description "Bridge client socket name=value pairs into Upstart"
23
24-start on filesystem
25+start on starting lxc-android-config
26
27 stop on runlevel [!2345]
28
29@@ -14,4 +14,7 @@
30
31 emits android-container
32
33-exec upstart-local-bridge --daemon --event=android-container --path=/dev/socket/upstart-text-bridge
34+script
35+ mkdir -p /dev/socket
36+ exec upstart-local-bridge --daemon --event=android-container --path=/dev/socket/upstart-text-bridge
37+end script
38
39=== modified file 'var/lib/lxc/android/pre-start.sh'
40--- var/lib/lxc/android/pre-start.sh 2013-08-01 12:45:38 +0000
41+++ var/lib/lxc/android/pre-start.sh 2013-10-02 21:34:25 +0000
42@@ -18,7 +18,6 @@
43 mkdir -p $LXC_ROOTFS_PATH/dev/pts
44
45 # Pass /sockets through
46-rm -Rf /dev/socket
47 mkdir -p /dev/socket $LXC_ROOTFS_PATH/socket
48 mount -n -o bind,rw /dev/socket $LXC_ROOTFS_PATH/socket
49

Subscribers

People subscribed via source and target branches