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

[Michael Terry]

Boots into unity8 using LightDM rather than custom upstart scripts.

Boots into unity8 using LightDM rather than custom upstart scripts.

This branch drops the custom, phablet-user-hardcoded upstart script and replaces them with a proper LightDM session. It keeps the GRID_UNIT_PX pieces as a wrapper around init, but drops the rest of the environment setting. PAM/LightDM does that for us now.

With this branch, we are brought yet closer to the same infrastructure the Desktop images use. Notably, logind will now recognize the user session as active, fixing some issues with policykit in the Touch images to date.

Performance wise in my informal testing, this seems to slow us down by a couple seconds. Not great, but didn't strike me as a deal breaker considering the benefits it brings.

Note that LightDM in Touch is *not* ready for an actual LightDM greeter. It can only work if a user is configured to be autologged in. I've added some configuration to livecd-rootfs to configure the 'phablet' user for autologin. This is in saucy now (livecd-rootfs 2.185). I figured it made sense to try to move any phablet-user hardcoding out of this package, letting it become a general purpose session suitable for any user to run.

However, this means the upgrade path is awkward, since only new images will have autologin configured. Anyone using the recommended system image upgrade path will get the fix, as well as anyone that reflashes.

To test with surfaceflinger, edit /etc/lightdm/lightdm.conf to contain:
[SeatDefaults]
type=surfaceflinger
user-session=ubuntu-touch-surfaceflinger

[Ted Gould (ted)]

Awesome. Excited about finally starting to switch over to lightdm based login. One comment. Could we switch the "GU parts" of the "ubuntu-touch-session" script to be a separate upstart session job? I'm thinking something that is "start on starting dbus" -- that way we'd get the same variables for apps that are being tested on the desktop or other platforms as they could have that same upstart job run.

Thanks for doing this!

[Michael Terry (mterry)]

OK, after talking on IRC, I believe we're agreed that the current GRID_UNIT_PX wrapper is a hopefully temporary hack. It should not be added to.

We can't just set the env vars in a user session script, because the greeter will need these vars too. And it doesn't run under a user init session (yet! :)).

[Oliver Grawert (ogra)]

While i would approve this now, i guess it hast to wait until Mir lands in the image (or at least it needs to be merged at the same time), feel free to ping me if the time is there

[Michael Terry (mterry)]

Marking WIP for now, while I determine why logind is showing the phablet user as inactive.

[Michael Terry (mterry)]

OK, figured out logind's problem, it's solved by lightdm 1.7.15-0ubuntu1, working its way from -proposed to released.

With this branch, that lightdm update, and reflashing your device from one of this week's images (to get /etc/lightdm/lightdm.conf.d/90-phablet.conf), everything should work. :)

[Sergio Schvezov (sergiusens)]

I created a package out of this, updated to latest and greatest and now see

initctl: unable to determine sessions

callbacks 0x436bcb59 0x436bcb05
creating surface at (0, 0) with size (720, 1280) with title 'Qml Phone Shell'
(process:3417): dconf-CRITICAL **: unable to create directory '/run/user/32011/dconf': Permission denied. dconf will not work properly.
__pthread_gettid -2
WARNING: QApplication was not created in the main() thread.
loaded the dummy plugin
loaded the Linux plugin
Registered the AalSensorPlugin types

(process:3768): dconf-CRITICAL **: unable to create directory '/run/user/32011/dconf': Permission denied. dconf will not work properly.

(process:3768): dconf-CRITICAL **: unable to create directory '/run/user/32011/dconf': Permission denied. dconf will not work properly.

(process:3768): dconf-CRITICAL **: unable to create directory '/run/user/32011/dconf': Permission denied. dconf will not work properly.
unity::action::ActionManager::ActionManager(QObject*):
 Could not determine application identifier. HUD will not work properly.
 Provide your application identifier in $APP_ID environment variable.

Fixed by changing perms on /run/user, so doing:

phablet@ubuntu-phablet:~$ sudo chmod 777 /run/user
[sudo] password for phablet:
phablet@ubuntu-phablet:~$ sudo initctl restart lightdm
lightdm start/running, process 2921

got unity8 going.

This still breaks for the people wanting to use the /home/phablet/.display-mir toggle

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

I've used this setup for a bit, session is super slow without the scheduling magic

review: Needs Fixing

[Oliver Grawert (ogra)]

i filed bug 1226997 on request of asac

[Michael Terry (mterry)]

I'm not convinced the slowness seen by testers is real. I can't reproduce anyway, on my Nexus4. Can you please retry? In the meantime, I've updated this branch to provide a surfaceflinger touch session.

You can enable it by installing the right lightdm branch [1], this branch, and editing /etc/lightdm.conf to contain:

[SeatDefaults]
type=surfaceflinger
user-session=ubuntu-touch-surfaceflinger

[1] https://code.launchpad.net/~robert-ancell/lightdm/surfaceflinger/+merge/186596

[Oliver Grawert (ogra)]

having to set this back to "needs review" (why dont we have "needs work" ?)
testing turned out that surfaceflinger can not start at all on maguro anymore with this merged this needs fixing before we try to land it again.

the test run at http://reports.qa.ubuntu.com/smokeng/saucy/touch_ro/4390/ has loads of logs etc which might or might not help.

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

103. By Michael Terry on 2013-09-23

Add back bashrc setting

104. By Michael Terry on 2013-09-23

Whoops, my cut and paste of bashrc bits got cut off

105. By Michael Terry on 2013-09-23

Merge from trunk, use surfaceflinger by default for now

106. By Michael Terry on 2013-09-24

Merge from trunk

=== added file '52-ubuntu-touch.conf'
--- 52-ubuntu-touch.conf	1970-01-01 00:00:00 +0000
+++ 52-ubuntu-touch.conf	2013-09-24 14:00:29 +0000
@@ -0,0 +1,5 @@
+[SeatDefaults]
+#type=unity
+#user-session=ubuntu-touch
+type=surfaceflinger
+user-session=ubuntu-touch-surfaceflinger

=== modified file 'debian/control'
--- debian/control	2013-09-23 23:06:46 +0000
+++ debian/control	2013-09-24 14:00:29 +0000
@@ -10,6 +10,7 @@
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         lightdm,
          upstart-app-launch (>= 0.1+13.10.20130923.4-0ubuntu1~),
 Conflicts: qml-phone-shell (<< 7.80~)
 Description: Ubuntu Session Manager for Ubuntu Touch Devices

=== modified file 'debian/ubuntu-touch-session.install'
--- debian/ubuntu-touch-session.install	2013-09-23 20:37:33 +0000
+++ debian/ubuntu-touch-session.install	2013-09-24 14:00:29 +0000
@@ -4,5 +4,7 @@
 *.override /etc/init
 ubuntu-touch-session.d/* /etc/ubuntu-touch-session.d/
 upstart-session/* /usr/share/upstart/sessions/
-ubuntu-touch-session-setup.conf /etc/init/
-ubuntu-touch-session.conf /etc/init/
+ubuntu-touch-session /usr/bin/
+ubuntu-touch.desktop /usr/share/lightdm/sessions
+ubuntu-touch-surfaceflinger.desktop /usr/share/lightdm/sessions
+52-ubuntu-touch.conf /etc/lightdm/lightdm.conf.d

=== added file 'debian/ubuntu-touch-session.maintscript'
--- debian/ubuntu-touch-session.maintscript	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-touch-session.maintscript	2013-09-24 14:00:29 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/init/ubuntu-touch-session.conf
+rm_conffile /etc/init/ubuntu-touch-session-setup.conf

=== added file 'lightdm.override'
--- lightdm.override	1970-01-01 00:00:00 +0000
+++ lightdm.override	2013-09-24 14:00:29 +0000
@@ -0,0 +1,9 @@
+limit nice 40 40
+oom score -10
+
+# lightdm normally waits for plymouth-ready, but since we disable plymouth, we
+# remove that condition from lightdm's start stanza.
+start on ((filesystem
+           and runlevel [!06]
+           and started dbus)
+          or runlevel PREVLEVEL=S)

=== renamed file 'ubuntu-touch-session.conf' => 'ubuntu-touch-session'
--- ubuntu-touch-session.conf	2013-09-23 10:06:06 +0000
+++ ubuntu-touch-session	2013-09-24 14:00:29 +0000
@@ -1,45 +1,34 @@
-author "Ricardo Mendoza <[e-mail]>"
-
-instance $USER
-
-stop on runlevel [016]
-
-limit nice 40 40
-oom score -10
-
-script
-    export HOME="/home/$USER"
-    bashrc=$HOME/.bashrc
-
-    uid=$(getent passwd "$USER"|cut -d: -f3)
-    export XDG_RUNTIME_DIR="/run/user/$uid"
-
-    for var in $(cat /etc/environment); do
-        export $var
-    done
-
-    device=$(getprop ro.product.device)
-
-    if [ -f "$HOME/.display-mir" ]; then
-        export QT_QPA_PLATFORM=ubuntumirclient
-    else
-        export QT_QPA_PLATFORM=ubuntu
-    fi
-
-    # defaults
-    GRID_UNIT_PX=18
-    QTWEBKIT_DPR=2.0
-
-    # override defaults by sourcing /etc/ubuntu-touch-session.d/$device.conf
-    [ -e /etc/ubuntu-touch-session.d/$device.conf ] && . /etc/ubuntu-touch-session.d/$device.conf
-
-    grep -q GRID_UNIT_PX $bashrc || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $bashrc
-    grep -q QTWEBKIT_DPR $bashrc || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $bashrc
-
-    export GRID_UNIT_PX=${GRID_UNIT_PX}
-    export QTWEBKIT_DPR=${QTWEBKIT_DPR}
-
-    export DESKTOP_SESSION=ubuntu-touch
-
-    exec su -s /bin/sh -c 'exec "$0" "$@"' $USER -- init --user
-end script
+#!/bin/sh
+
+# WARNING: this wrapper is only for setting up screen environment variables
+# that would need to be shared between a greeter process and the user session.
+# Do NOT add any other hacks here.  We eventually intend for this wrapper to
+# go away, once we dynamically determine screen settings.
+
+if [ -f "$HOME/.display-mir" ]; then
+    export QT_QPA_PLATFORM=ubuntumirclient
+else
+    export QT_QPA_PLATFORM=ubuntu
+fi
+
+# defaults
+GRID_UNIT_PX=18
+QTWEBKIT_DPR=2.0
+
+# override defaults by sourcing /etc/ubuntu-touch-session.d/$device.conf
+device=$(getprop ro.product.device)
+[ -e /etc/ubuntu-touch-session.d/$device.conf ] && . /etc/ubuntu-touch-session.d/$device.conf
+
+export GRID_UNIT_PX=${GRID_UNIT_PX}
+export QTWEBKIT_DPR=${QTWEBKIT_DPR}
+
+# Save in bashrc so that adb picks them up (for autopilot's benefit)
+bashrc=$HOME/.bashrc
+grep -q GRID_UNIT_PX $bashrc || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $bashrc
+grep -q QTWEBKIT_DPR $bashrc || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $bashrc
+
+if [ "$#" -ne 0 ]; then
+    $@
+else
+    init --user
+fi

=== removed file 'ubuntu-touch-session-setup.conf'
--- ubuntu-touch-session-setup.conf	2013-09-23 09:09:03 +0000
+++ ubuntu-touch-session-setup.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-author "Ricardo Mendoza <[e-mail]>"
-
-start on (started udev
-	     and started dbus)
-stop on stopping dbus
-
-env user=phablet
-export user
-
-script
-    start ubuntu-touch-session USER=phablet
-end script

=== added file 'ubuntu-touch-surfaceflinger.desktop'
--- ubuntu-touch-surfaceflinger.desktop	1970-01-01 00:00:00 +0000
+++ ubuntu-touch-surfaceflinger.desktop	2013-09-24 14:00:29 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Ubuntu Touch
+Exec=ubuntu-touch-session
+TryExec=ubuntu-touch-session
+Type=Application
+X-LightDM-Session-Type=surfaceflinger
+X-LightDM-DesktopName=Unity

=== added file 'ubuntu-touch.desktop'
--- ubuntu-touch.desktop	1970-01-01 00:00:00 +0000
+++ ubuntu-touch.desktop	2013-09-24 14:00:29 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Ubuntu Touch
+Exec=ubuntu-touch-session
+TryExec=ubuntu-touch-session
+Type=Application
+X-LightDM-Session-Type=mir
+X-LightDM-DesktopName=Unity

=== modified file 'upstart-session/unity8.conf'
--- upstart-session/unity8.conf	2013-09-23 09:09:03 +0000
+++ upstart-session/unity8.conf	2013-09-24 14:00:29 +0000
@@ -1,7 +1,7 @@
 description "Unity Shell v8"
 author "Ricardo Mendoza <[e-mail]>"
 
-start on xsession SESSION=ubuntu-touch and started dbus
+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
 stop on desktop-end
 
 respawn