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 <email address hidden> Mon, 15 Sep 2014 12:33:09 +0000 + unity8-desktop-session (1.0.10+14.04.20140417.1-0ubuntu1) trusty; urgency=low
[ Michał Sawicz ]
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 desktop- session- 1.0.10+ 14.04.20140417. 1/data/ 55-unity8. conf 2014-04-17 05:07:47.000000000 -0700 desktop- session- 1.0.10+ 14.04.20140915/ data/55- unity8. conf 2014-09-15 05:32:54.000000000 -0700 unity8- mir compositor- command= /usr/sbin/ unity-system- compositor wrapper= lightdm- unity8- session 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 desktop- session- 1.0.10+ 14.04.20140417. 1/data/ lightdm- unity8- session 2014-04-17 05:07:47.000000000 -0700 desktop- session- 1.0.10+ 14.04.20140915/ data/lightdm- unity8- session 2014-09-15 05:32:54.000000000 -0700
--- unity8-
+++ unity8-
@@ -1,2 +1,4 @@
[SeatDefaults]
+user-session=
+unity-
session-
diff -Nru unity8-
--- unity8-
+++ unity8-
@@ -4,7 +4,7 @@
# traditional X-based desktop session startup.
#
-if test -z "$DISPLAY"; then lightdm- session "$@" desktop- session- 1.0.10+ 14.04.20140417. 1/debian/ changelog unity8- desktop- session- 1.0.10+ 14.04.20140915/ debian/ changelog desktop- session- 1.0.10+ 14.04.20140417. 1/debian/ changelog 2014-09-18 13:49:23.000000000 -0700 desktop- session- 1.0.10+ 14.04.20140915/ debian/ changelog 2014-09-18 13:49:23.000000000 -0700 desktop- session (1.0.10+ 14.04.20140915- 0ubuntu1) trusty; urgency=low unity-system- compositor. (LP: #1359332) desktop- session (1.0.10+ 14.04.20140417. 1-0ubuntu1) trusty; urgency=low
+if test -z "$DISPLAY" && [ $DESKTOP_SESSION != "unity8-mir-lxc" ]; then
exec init --user
else
exec /usr/sbin/
diff -Nru unity8-
--- unity8-
+++ unity8-
@@ -1,3 +1,12 @@
+unity8-
+
+ [ 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/
+
+ -- Ubuntu daily release <email address hidden> Mon, 15 Sep 2014 12:33:09 +0000
+
unity8-
[ Michał Sawicz ]