Merge lp:~mterry/ubuntu-touch-session/no-lightdm-session into lp:ubuntu-touch-session

[Michael Terry]

Don't run lightdm-session if using a Mir session.

Don't run lightdm-session if using a Mir session.

/usr/sbin/lightdm-session is a wrapper for user sessions that LightDM uses to set up a bunch of X stuff. But in Mir, we don't want that.

Having it run for Mir meant that with dbus-x11 installed, we'd get a second dbus daemon in the user shell which is confusing autopilot tests.

[lp:~mterry/ubuntu-touch-session/no-lightdm-session]

184. By Michael Terry on 2014-06-03

Version dep on unity8-greeter

[Michał Sawicz (saviq)]

Kk.

review: Approve

[lp:~mterry/ubuntu-touch-session/no-lightdm-session]

185. By Michael Terry on 2014-06-04

Merge from trunk

=== modified file '52-ubuntu-touch.conf'
--- 52-ubuntu-touch.conf	2014-04-03 18:53:19 +0000
+++ 52-ubuntu-touch.conf	2014-06-04 15:16:45 +0000
@@ -1,6 +1,7 @@
 [SeatDefaults]
 type=unity
 user-session=ubuntu-touch
+session-wrapper=/usr/sbin/ubuntu-touch-lightdm-session
 unity-compositor-command=/usr/share/ubuntu-touch-session/usc-wrapper
 autologin-in-background=true
 

=== modified file 'debian/control'
--- debian/control	2014-06-01 20:44:44 +0000
+++ debian/control	2014-06-04 15:16:45 +0000
@@ -13,7 +13,7 @@
 Architecture: all
 Depends: lightdm (>= 1.9.5),
          unity-system-compositor (>= 0.0.3),
-         unity8-greeter,
+         unity8-greeter (>= 7.88),
          ubuntu-app-launch (>= 0.1+13.10.20130923.4-0ubuntu1~),
          ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'debian/ubuntu-touch-session.install'
--- debian/ubuntu-touch-session.install	2014-05-12 16:21:05 +0000
+++ debian/ubuntu-touch-session.install	2014-06-04 15:16:45 +0000
@@ -4,6 +4,7 @@
 *.override /etc/init
 ubuntu-touch-session.d/* /etc/ubuntu-touch-session.d/
 upstart-session/* /usr/share/upstart/sessions/
+ubuntu-touch-lightdm-session /usr/sbin/
 ubuntu-touch-session /usr/bin/
 ubuntu-touch.desktop /usr/share/lightdm/sessions
 52-ubuntu-touch.conf /usr/share/lightdm/lightdm.conf.d

=== added file 'ubuntu-touch-lightdm-session'
--- ubuntu-touch-lightdm-session	1970-01-01 00:00:00 +0000
+++ ubuntu-touch-lightdm-session	2014-06-04 15:16:45 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# /usr/sbin/lightdm-session is very X specific.  We don't want it for Ubuntu
+# Touch's Mir sessions.  So determine if we are running Mir or X and do the
+# right thing.  Ideally LightDM would do this for us, but in the meantime...
+
+if [ -n "$MIR_SOCKET" ]; then
+    exec $@
+else
+    exec /usr/sbin/lightdm-session $@
+fi