Merge lp:~vicamo/lxc-android-config/add-upstart-local-bridge into lp:lxc-android-config

[You-Sheng Yang]

Add systemd upstart-local-bridge service

Add systemd upstart-local-bridge service

[Łukasz Zemczak (sil2100)]

I wonder if we could somehow make this only run when we know that systemd is in use. I don't have much experience here, but will having this bridge run have any influence on systems that do not use systemd? (like our stable vivid-based touch systems)

review: Needs Information

[You-Sheng Yang (vicamo)]

That's a systemd service file, so this unit surely only run with systemd. To be clear, there is also a lxc-android-config.upstart file under debian/, so upstart-local-bridge already runs in vivid+upstart as part of the android container stack.

[lp:~vicamo/lxc-android-config/add-upstart-local-bridge]

26. By You-Sheng Yang on 2016-10-04

Add systemd force-mtp.service.

27. By You-Sheng Yang on 2016-10-04

Install force-mtp.service to multi-user.target as well.

[You-Sheng Yang (vicamo)]

Added missed force-mtp.service. Then eng-build device should automatically start adbd service.

[Łukasz Zemczak (sil2100)]

Ah, right, even though we do have systemd installed it's not enabled for those (without systemd-sysv). Somehow I had some wrong impression. +1

review: Approve

[You-Sheng Yang (vicamo)]

Confirmed landed in 0.230+16.04.20161004-0ubuntu1, rootfs rev 51.

=== modified file 'debian/lxc-android-config.service'
--- debian/lxc-android-config.service	2015-09-02 07:50:44 +0000
+++ debian/lxc-android-config.service	2016-10-04 07:15:56 +0000
@@ -1,7 +1,8 @@
 [Unit]
 Description=LXC Android Config and Container Initialization
 Requires=cgmanager.service
-After=cgmanager.service
+Wants=upstart-local-bridge.service
+After=cgmanager.service upstart-local-bridge.service
 
 [Service]
 ExecStartPre=/usr/lib/lxc-android-config/copy-udev-unflipped

=== added file 'lib/systemd/system/force-mtp.service'
--- lib/systemd/system/force-mtp.service	1970-01-01 00:00:00 +0000
+++ lib/systemd/system/force-mtp.service	2016-10-04 07:15:56 +0000
@@ -0,0 +1,10 @@
+[Unit]
+Requires=lxc-android-config.service
+After=lightdm.service lxc-android-config.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/android-gadget-service enable mtp
+
+[Install]
+WantedBy=multi-user.target

=== added file 'lib/systemd/system/upstart-local-bridge.service'
--- lib/systemd/system/upstart-local-bridge.service	1970-01-01 00:00:00 +0000
+++ lib/systemd/system/upstart-local-bridge.service	2016-10-04 07:15:56 +0000
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bridge client socket name=value pairs into Upstart
+Before=lxc-android-config.service
+
+[Service]
+Type=forking
+ExecStartPre=/bin/mkdir -p /dev/socket
+ExecStart=/sbin/upstart-local-bridge --daemon --event=android-container --path=/dev/socket/upstart-text-bridge
+
+[Install]
+WantedBy=multi-user.target