Here is the diff for future reviewers: diff -Nru unity8-desktop-session-1.0.10+14.04.20140417.1/data/55-unity8.conf unity8-desktop-session-1.0.10+14.04.20140915/data/55-unity8.conf --- unity8-desktop-session-1.0.10+14.04.20140417.1/data/55-unity8.conf 2014-04-17 05:07:47.000000000 -0700 +++ unity8-desktop-session-1.0.10+14.04.20140915/data/55-unity8.conf 2014-09-15 05:32:54.000000000 -0700 @@ -1,2 +1,4 @@ [SeatDefaults] +user-session=unity8-mir +unity-compositor-command=/usr/sbin/unity-system-compositor session-wrapper=lightdm-unity8-session diff -Nru unity8-desktop-session-1.0.10+14.04.20140417.1/data/lightdm-unity8-session unity8-desktop-session-1.0.10+14.04.20140915/data/lightdm-unity8-session --- unity8-desktop-session-1.0.10+14.04.20140417.1/data/lightdm-unity8-session 2014-04-17 05:07:47.000000000 -0700 +++ unity8-desktop-session-1.0.10+14.04.20140915/data/lightdm-unity8-session 2014-09-15 05:32:54.000000000 -0700 @@ -4,7 +4,7 @@ # traditional X-based desktop session startup. #
-if test -z "$DISPLAY"; then +if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-mir-lxc" ]; then exec init --user else exec /usr/sbin/lightdm-session "$@" diff -Nru unity8-desktop-session-1.0.10+14.04.20140417.1/debian/changelog unity8-desktop-session-1.0.10+14.04.20140915/debian/changelog --- unity8-desktop-session-1.0.10+14.04.20140417.1/debian/changelog 2014-09-18 13:49:23.000000000 -0700 +++ unity8-desktop-session-1.0.10+14.04.20140915/debian/changelog 2014-09-18 13:49:23.000000000 -0700 @@ -1,3 +1,12 @@ +unity8-desktop-session (1.0.10+14.04.20140915-0ubuntu1) trusty; urgency=low + + [ Chris Townsend ] + * Add check to see if the Unity8 LXC session is not being started + before calling the init script. Also, add explicit call to + /usr/sbin/unity-system-compositor. (LP: #1359332) + + -- Ubuntu daily release <ps-jenk...@lists.canonical.com> Mon, 15 Sep 2014 12:33:09 +0000 + unity8-desktop-session (1.0.10+14.04.20140417.1-0ubuntu1) trusty; urgency=low [ Michał Sawicz ] -- You received this bug notification because you are a member of Desktop Packages, which is subscribed to lightdm in Ubuntu. https://bugs.launchpad.net/bugs/1359332 Title: Need to allow for both Unity 8 desktop "bare metal" and LXC sessions Status in Light Display Manager: Fix Released Status in Light Display Manager 1.10 series: Fix Released Status in Unity 8 Desktop Session: Fix Committed Status in unity8-desktop-session trusty series: In Progress Status in Unity8 Desktop Preview in LXC: Fix Committed Status in “lightdm” package in Ubuntu: Fix Released Status in “unity8-desktop-session” package in Ubuntu: Fix Released Status in “lightdm” source package in Trusty: New Status in “unity8-desktop-session” source package in Trusty: New Status in “lightdm” source package in Utopic: Fix Released Status in “unity8-desktop-session” source package in Utopic: Fix Released Bug description: It would be desirable to allow both the Unity 8 desktop preview session from the archive and the Unity 8 desktop preview in the LXC to be installed at the same time. Currently, the Unity 8 desktop preview in LXC conflicts the "bare metal" Unity 8 desktop preview session. To manage notifications about this bug go to: https://bugs.launchpad.net/lightdm/+bug/1359332/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
