~unity8-desktop-session-team/unity8-desktop-session/trunk

Committer: CI bot
Author(s): Christopher Townsend
Date: 2014-08-29 18:19:32 UTC
mfrom: <a title="Merged From 66.1.1" href="/~unity8-desktop-session-team/unity8-desktop-session/trunk/revision/66.1.1">(66.1.1 unity8-desktop-session)
Revision ID: ps-jenkins@lists.canonical.com-20140829181932-phh0c3luhw24es01

Add check to see if the Unity8 LXC session is not being started before calling the init script. Fixes: 1359332
Approved by: Stephen M. Webb

added added

removed removed

# traditional X-based desktop session startup.

if test -z "$DISPLAY"; then

if test -z "$DISPLAY" && [ $XDG_SESSION_DESKTOP != "unity8-mir-lxc" ]; then

export QT_QPA_PLATFORM=ubuntumirclient

export UNITY_INDICATOR_PROFILE=desktop

exec init --user