Merge lp:~mterry/unity8-desktop-session/systemd into lp:unity8-desktop-session

[Michael Terry]

WIP

[lp:~mterry/unity8-desktop-session/systemd]

129. By Michael Terry on 2017-04-03

Set systemd environment variables from lightdm session script

Unmerged revisions

129. By Michael Terry on 2017-04-03

Set systemd environment variables from lightdm session script

128. By Michael Terry on 2017-03-24

Name session script back, don't need to confuse things

127. By Michael Terry on 2017-03-24

Use systemd to start unity8

=== modified file 'data/45-unity8.conf'
--- data/45-unity8.conf	2016-07-14 14:26:54 +0000
+++ data/45-unity8.conf	2017-04-03 17:42:42 +0000
@@ -1,4 +1,3 @@
 [Seat:*]
 user-session=unity8
 unity-compositor-command=unity-system-compositor.sleep
-session-wrapper=lightdm-unity8-session
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2017-03-23 18:09:26 +0000
+++ data/Makefile.am	2017-04-03 17:42:42 +0000
@@ -19,7 +19,6 @@
 lightdmdir = ${datadir}/lightdm
 lightdm_confdir = ${lightdmdir}/lightdm.conf.d
 lightdm_sessiondir = ${lightdmdir}/sessions
-upstart_sessiondir = ${datadir}/upstart/sessions
 
 dist_pkgdata_DATA = \
 	sensors.txt
@@ -38,9 +37,6 @@
 dist_bin_SCRIPTS = \
 	lightdm-unity8-session
 
-dist_upstart_session_DATA = \
-	unity8-copy-env.conf
-
 EXTRA_DIST = \
 	unity8.desktop.in
 
 
=== modified file 'data/lightdm-unity8-session'
--- data/lightdm-unity8-session	2016-11-03 19:53:05 +0000
+++ data/lightdm-unity8-session	2017-04-03 17:42:42 +0000
@@ -1,40 +1,26 @@
 #!/bin/sh 
-#
-# If no X server is available, just run upstart, otherwise fall back to the
-# traditional X-based desktop session startup.
-#
-
-if [ -z "$DISPLAY" -a "$DESKTOP_SESSION" != "unity8-snap" ]; then
-  # TODO: The following block is to work around the OOBE wizard for the phone.
-  #       See LP: #1435877.
-  if [ ! -f $HOME/.config/ubuntu-system-settings/wizard-has-run ]; then
-    mkdir -p $HOME/.config/ubuntu-system-settings
-    touch $HOME/.config/ubuntu-system-settings/wizard-has-run
-  fi
-
-  # Set up xdg dirs
-  [ -z "$XDG_CONFIG_DIRS" ] && export XDG_CONFIG_DIRS=/etc/xdg
-  [ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS=/usr/local/share:/usr/share
-  if [ -n "$DESKTOP_SESSION" ]; then
-      export XDG_CONFIG_DIRS=/etc/xdg/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
-      export XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
-  fi
-
-  # Do any system-configured setup.
-  for profile in "/etc/profile" "$HOME/.profile"; do
-    if [ -r "$profile" ]; then
-      . "$profile"
-    fi
-  done
-
-  # work around crashes caused by appmenu-qt5
-  # https://bugs.launchpad.net/appmenu-qt5/+bug/1606246
-  unset QT_QPA_PLATFORMTHEME
-
-  export QT_QPA_PLATFORM=ubuntumirclient
-  export UNITY_INDICATOR_PROFILE=desktop
-  export UBUNTU_PLATFORM_API_BACKEND=desktop_mirclient
-  exec upstart --user
-else
-  exec /usr/sbin/lightdm-session "$@"
+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 2 -*-
+
+# TODO: The following block is to work around the OOBE wizard for the phone.
+#       See LP: #1435877.
+# From mterry: This should be removed, I think; I believe our wizard should run
+#              for the user even on the desktop (it does in snappy, and
+#              should on classic too).  But I'm writing this late in the
+#              zesty cycle and don't want to change anything now.
+if [ ! -f $HOME/.config/ubuntu-system-settings/wizard-has-run ]; then
+  mkdir -p $HOME/.config/ubuntu-system-settings
+  touch $HOME/.config/ubuntu-system-settings/wizard-has-run
 fi
+
+systemctl --user import-environment
+systemctl --user set-environment MIR_SERVER_VT=$XDG_VTNR
+
+dbus-update-activation-environment --systemd QT_QPA_PLATFORM=ubuntumirclient
+dbus-update-activation-environment --systemd UBUNTU_PLATFORM_API_BACKEND=desktop_mirclient
+
+/usr/lib/gnome-session/run-systemd-session unity8.service
+
+dbus-update-activation-environment --systemd QT_QPA_PLATFORM=
+dbus-update-activation-environment --systemd UBUNTU_PLATFORM_API_BACKEND=
+
+exit 0
 
=== removed file 'data/unity8-copy-env.conf'
--- data/unity8-copy-env.conf	2017-03-23 18:09:26 +0000
+++ data/unity8-copy-env.conf	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# -*- 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/control'
--- debian/control	2017-03-07 13:40:17 +0000
+++ debian/control	2017-04-03 17:42:42 +0000
@@ -15,7 +15,9 @@
 # Remove conflicts while in development
 Replaces: unity8-desktop-session-mir (<< 1.0.13)
 Breaks: unity8-desktop-session-mir (<< 1.0.13)
-Depends: mir-graphics-drivers-desktop,
+Depends: dbus,
+         gnome-session-bin,
+         mir-graphics-drivers-desktop,
          packagekit,
          policykit-unity8,
          qtmir-desktop,
@@ -25,7 +27,6 @@
          unity-system-compositor,
          unity8,
          url-dispatcher,
-         upstart,
          ${misc:Depends}
 Recommends: indicator-transfer,
             ubuntu-terminal-app,
@@ -36,20 +37,10 @@
           gallery-app,
           mediaplayer-app
 Description: Unity8 desktop session for Mir
- .
  A desktop session running Unity8 on a Mir back end.
  .
  This package is provided for evaluation and demonstration purposes only.
 
-Package: unity8-desktop-session-mir
-Depends: unity8-desktop-session (>= 1.0.13),
-         ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Priority: extra
-Description: transitional dummy package
- This is a transitional dummy package.  It can safely be removed.
-
 Package: unity8-session-snap
 Architecture: all
 # Conflicts: unity8-desktop-session
 
=== modified file 'debian/unity8-desktop-session.install'
--- debian/unity8-desktop-session.install	2017-03-23 18:09:26 +0000
+++ debian/unity8-desktop-session.install	2017-04-03 17:42:42 +0000
@@ -3,4 +3,3 @@
 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