Merge lp:~mterry/unity8-desktop-session/copy-env into lp:unity8-desktop-session

[Michael Terry]

Copy our upstart environment into dbus and systemd, making sure that activated services have the correct environment.

As noted in the comments for the upstart job, this is a temporary solution. We are actively working on dropping upstart altogether. But I didn't want to block bug 1675437 and silos that are moving bits to systemd on us getting the last piece in place.

So this just manually does the copying for now, after unity8 starts. We'll need to revamp this when we drop upstart obviously.

(Testing note: the systemd portion of this does not work in xenial -- or at least xenial+overlay. The dbus API for xenial's systemd doesn't work.)

[Ken VanDine (ken-vandine)]

I think this is a reasonable solution for now. I've tested this on a clean zesty install, works great.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-09-13 16:38:27 +0000
+++ data/Makefile.am	2017-03-23 18:15:34 +0000
@@ -19,6 +19,7 @@
 lightdmdir = ${datadir}/lightdm
 lightdm_confdir = ${lightdmdir}/lightdm.conf.d
 lightdm_sessiondir = ${lightdmdir}/sessions
+upstart_sessiondir = ${datadir}/upstart/sessions
 
 dist_pkgdata_DATA = \
 	sensors.txt
@@ -37,6 +38,9 @@
 dist_bin_SCRIPTS = \
 	lightdm-unity8-session
 
+dist_upstart_session_DATA = \
+	unity8-copy-env.conf
+
 EXTRA_DIST = \
 	unity8.desktop.in
 

=== added file 'data/unity8-copy-env.conf'
--- data/unity8-copy-env.conf	1970-01-01 00:00:00 +0000
+++ data/unity8-copy-env.conf	2017-03-23 18:15:34 +0000
@@ -0,0 +1,32 @@
+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 2 -*-
+
+description "Copy Upstart Environment for Unity 8"
+author "Michael Terry <[e-mail]>"
+
+start on started unity8
+task
+
+script
+  # Share our upstart env with dbus and systemd, so all activated services
+  # and applications will have the same environment.  This was originally done
+  # to make sure everyone has QT_QPA_PLATFORM, but other vars are likely useful
+  # too.
+
+  # FIXME: This script should go away shortly.  In the short term, it should be
+  # replaced by just doing everything in systemd directly and adjusting how
+  # unity8 configures its environment.  In the long term, everything will be
+  # a snap and not need external environment variables to be set.  But in the
+  # very immediate term, this helps avoid regressions as we migrate away from
+  # upstart.
+
+  # (script is copied from /etc/X11/Xsession.d/95dbus_update-activation-env)
+
+  # unset login-session-specifics
+  unset XDG_SEAT
+  unset XDG_SESSION_ID
+  unset XDG_VTNR
+
+  # tell dbus-daemon --session (and systemd --user, if running)
+  # to put our environment in activated services' environments
+  dbus-update-activation-environment --verbose --systemd --all
+end script

=== modified file 'debian/unity8-desktop-session.install'
--- debian/unity8-desktop-session.install	2016-07-26 13:10:53 +0000
+++ debian/unity8-desktop-session.install	2017-03-23 18:15:34 +0000
@@ -3,3 +3,4 @@
 usr/share/lightdm/sessions/unity8.desktop
 usr/share/unity-greeter/custom_unity8_badge.png
 usr/share/unity8-desktop-session/sensors.txt
+usr/share/upstart/sessions/unity8-copy-env.conf