lxc-android-config

Merge lp:~vicamo/lxc-android-config/adbd-emergency-shell into lp:lxc-android-config

  1. adbd-emergency-shell
  2. Merge into trunk
Proposed by You-Sheng Yang
Status: Needs review
Proposed branch: lp:~vicamo/lxc-android-config/adbd-emergency-shell
Merge into: lp:lxc-android-config
Diff against target: 19 lines (+3/-0)
2 files modified
debian/lxc-android-config.service (+1/-0)
lib/systemd/system/lightdm.service.d/adbd-emergency-shell.conf (+2/-0)
To merge this branch: bzr merge lp:~vicamo/lxc-android-config/adbd-emergency-shell
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+310739@code.launchpad.net

Description of the change

Fix adbd emergency shell under systemd. (LP: #1641505)

To post a comment you must log in.

Unmerged revisions

34. By You-Sheng Yang

Fix adbd emergency shell under systemd. (LP: #1641505)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/lxc-android-config.service'
2--- debian/lxc-android-config.service 2016-10-04 08:14:24 +0000
3+++ debian/lxc-android-config.service 2016-11-14 06:39:46 +0000
4@@ -10,6 +10,7 @@
5 ExecStart=/usr/bin/lxc-start -n android -d -- /init
6 ExecStartPost=/usr/lib/lxc-android-config/lxc-android-ready
7 ExecStop=/usr/bin/lxc-stop -n android -k
8+ExecStopPost=/bin/sh -c '[ "$EXIT_CODE" = "0" ] || /usr/lib/android-tools-adbd/start-emergency-shell'
9
10 [Install]
11 WantedBy=multi-user.target
12
13=== added directory 'lib/systemd/system/lightdm.service.d'
14=== added file 'lib/systemd/system/lightdm.service.d/adbd-emergency-shell.conf'
15--- lib/systemd/system/lightdm.service.d/adbd-emergency-shell.conf 1970-01-01 00:00:00 +0000
16+++ lib/systemd/system/lightdm.service.d/adbd-emergency-shell.conf 2016-11-14 06:39:46 +0000
17@@ -0,0 +1,2 @@
18+[Service]
19+ExecStopPost=/bin/sh -c '[ "$EXIT_CODE" = "0" ] || /usr/lib/android-tools-adbd/start-emergency-shell'

Subscribers

People subscribed via source and target branches