Merge lp:~townsend/unity8-desktop-session/fix-lp1376444.trusty into lp:unity8-desktop-session/trusty

Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 51
Merged at revision: 51
Proposed branch: lp:~townsend/unity8-desktop-session/fix-lp1376444.trusty
Merge into: lp:unity8-desktop-session/trusty
Diff against target: 12 lines (+1/-1)
1 file modified
data/lightdm-unity8-session (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity8-desktop-session/fix-lp1376444.trusty
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+238557@code.launchpad.net

Commit message

Change the string comparison to "unity8-lxc" since that session has been renamed to remove the mir reference.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Affirmative.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/lightdm-unity8-session'
2--- data/lightdm-unity8-session 2014-09-12 19:19:25 +0000
3+++ data/lightdm-unity8-session 2014-10-16 13:20:24 +0000
4@@ -4,7 +4,7 @@
5 # traditional X-based desktop session startup.
6 #
7
8-if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-mir-lxc" ]; then
9+if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-lxc" ]; then
10 exec init --user
11 else
12 exec /usr/sbin/lightdm-session "$@"

Subscribers

People subscribed via source and target branches