Ubuntu Touch session manager

Merge lp:~pitti/ubuntu-touch-session/systemd into lp:ubuntu-touch-session

  1. systemd
  2. Merge into trunk
Proposed by Martin Pitt on 2015-05-05
Status: Merged
Approved by: Oliver Grawert on 2015-05-05
Approved revision: 271
Merged at revision: 271
Proposed branch: lp:~pitti/ubuntu-touch-session/systemd
Merge into: lp:ubuntu-touch-session
Diff against target: 10 lines (+1/-1)
1 file modified
ubuntu-touch-session (+1/-1)
To merge this branch: bzr merge lp:~pitti/ubuntu-touch-session/systemd
Reviewer Review Type Date Requested Status
Oliver Grawert 2015-05-05 Approve on 2015-05-05
Review via email: mp+258240@code.launchpad.net

Commit Message

Stop assuming that "init" is upstart, to fix session startup failure with systemd-sysv.

Description of the Change

Fix session startup failure under systemd-sysv

To post a comment you must log in.
Oliver Grawert (ogra) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-touch-session'
2--- ubuntu-touch-session 2015-02-11 15:23:43 +0000
3+++ ubuntu-touch-session 2015-05-05 11:08:18 +0000
4@@ -67,5 +67,5 @@
5 if [ "$#" -ne 0 ]; then
6 exec $@
7 else
8- exec init --user
9+ exec upstart --user
10 fi

Subscribers

People subscribed via source and target branches