unity8-desktop-session

Merge lp:~aacid/unity8-desktop-session/do_not_hijack_snap into lp:unity8-desktop-session

  1. do_not_hijack_snap
  2. Merge into trunk
Proposed by Albert Astals Cid on 2016-11-03
Status: Merged
Approved by: Christopher Townsend on 2016-11-04
Approved revision: 106
Merged at revision: 106
Proposed branch: lp:~aacid/unity8-desktop-session/do_not_hijack_snap
Merge into: lp:unity8-desktop-session
Diff against target: 12 lines (+1/-1)
1 file modified
data/lightdm-unity8-session (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8-desktop-session/do_not_hijack_snap
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) 2016-11-03 Approve on 2016-11-03
Review via email: mp+309978@code.launchpad.net

Commit Message

Also run the regular /usr/sbin/lightdm-session for snap based unity8

To post a comment you must log in.
Stephen M. Webb (bregma) wrote :

OK by me... I find using a command pipeline a little odd to use instead of a compound expression in an if statement, but I guess that's a pre-existing weirdness. I also find it weird that the Unity 8 snap is going to depend on X11 being installed in the system, but maybe that's a LightDM problem and outside the scope of this change.

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 2016-07-26 11:32:59 +0000
3+++ data/lightdm-unity8-session 2016-11-03 16:59:33 +0000
4@@ -4,7 +4,7 @@
5 # traditional X-based desktop session startup.
6 #
7
8-if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-lxc" ]; then
9+if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-lxc" ] && [ $DESKTOP_SESSION != "unity8-snap" ]; then
10 # TODO: The following block is to work around the OOBE wizard for the phone.
11 # See LP: #1435877.
12 if [ ! -f $HOME/.config/ubuntu-system-settings/wizard-has-run ]; then

Subscribers

People subscribed via source and target branches