unity8-desktop-session

Merge lp:~townsend/unity8-desktop-session/remove-unity8-lxc into lp:unity8-desktop-session

Proposed by Christopher Townsend on 2016-11-03

Status:	Merged
Approved by:	Stephen M. Webb on 2016-11-03
Approved revision:	108
Merged at revision:	107
Proposed branch:	lp:~townsend/unity8-desktop-session/remove-unity8-lxc
Merge into:	lp:unity8-desktop-session
Prerequisite:	lp:~aacid/unity8-desktop-session/do_not_hijack_snap
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/remove-unity8-lxc
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Stephen M. Webb (community)		2016-11-03	Approve on 2016-11-03
Review via email: mp+309987@code.launchpad.net

Remove the check for unity8-lxc since that is no longer available.

108. By Christopher Townsend on 2016-11-03: Use a little more clear logical expression.

Stephen M. Webb (bregma) on 2016-11-03:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'data/lightdm-unity8-session'
2	--- data/lightdm-unity8-session 2016-11-03 19:53:46 +0000
3	+++ data/lightdm-unity8-session 2016-11-03 19:53:46 +0000
4	@@ -4,7 +4,7 @@
5	# traditional X-based desktop session startup.
6	#
7
8	-if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-lxc" ] && [ $DESKTOP_SESSION != "unity8-snap" ]; then
9	+if [ -z "$DISPLAY" -a "$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