Merge lp:~ted/unity/systemd-unit. into lp:unity

[Ted Gould]

Adding systemd user session units

At it's core this MR is about making unity7 work with the systemd user sessions. It required a larger change than expected, so some descriptions :-)

It moves the prestart scripts from Upstart into a shared shell script so that both systemd and Upstart can use the same code.

Added a signal wrapper for Systemd, today we are sending both signals as both will be running for the time being. In the future the Upstart signals should be droppable.

For lock screen we created a target for when the lock screen is enabled. We put the panel job in there, but other jobs can add themselves by putting a symbolic link into the "unity-screen-locked.target.wants" directory to their jobs if they want.

[Marco Trevisan (Treviño) (3v1n0)]

There have been changes recently to upstart job to change COMPIZ_CONFIG_PROFILE depending on the gfx environment. So please sync with upstream changes on that.

Also, please rebase on lp:~azzar1/unity/unity-active-plugins--safety-check, which will need to be ported too

[Marco Trevisan (Treviño) (3v1n0)]

I don't see unity-compiz-profile in any .install file.

Please move that into unity.install together with systemd (and unity7.conf file). I don't remember why they were added there in the past (likely for some gsettings and unity8 dependency on libunity-core), but I think that is not the nicest places to be.

[Marco Trevisan (Treviño) (3v1n0)]

Can you please merge this again with lp:~azzar1/unity/unity-active-plugins--safety-check?

It should be the last time :-)

[Marco Trevisan (Treviño) (3v1n0)]

As per channel discussion:

15:15:38 <Trevinho> tedg: also, I was thinking... using that code in the current yakkety causes the Start/Stop calls to not happen since the proxy is not connected... They get queued though... Maybe you could avoid to call start/stop if the systemd_proxy_ is not connected?
15:16:37 <Trevinho> tedg: at the beginning I had the idea of just provinding one of the two wrappers, depending on what is running in the session, but... It's a little to annoying, and I didn't want you to create an abstract class just for that, but... Maybe...
15:16:55 <tedg> Trevinho: Oh, because it's connecting to the session bus instead of the user bus right now?
15:17:04 <Trevinho> tedg: yes
15:17:14 <tedg> Trevinho: We won't have the Upstart stuff for long hopefully, so I don't think it's worth abstracting.
15:18:18 <Trevinho> tedg: yeah, same I thought...
15:18:36 <Trevinho> tedg: but currently guess we'd get some "Timed out waiting for proxy" erros in unity logs
15:18:37 <Trevinho> so...
15:19:11 <Trevinho> tedg: is an env var available when systemd is there?
15:19:55 <tedg> tedg: I think checking if it's connected is fine. We can drop that too once we get migrated over if it's taking too long.
15:20:03 <Trevinho> ok...
15:20:30 <Trevinho> tedg: I mean, it might be not connected at the very start of the session... Like if starting with unity already locked (because of a crash) though
15:20:48 <Trevinho> but... Yeah, as you say, this is something we can get rid of
15:21:08 <Trevinho> or, juts check for an env var presency for both upstart and systemd wrappers
15:23:01 <Trevinho> tedg: also /usr/share/unity/unity-compiz-profile I'd prefer it to be in /usr/lib/unity
15:24:04 <Trevinho> tedg: and probably renamed unity-compiz-profile-set or -selector or... anything that explains better :-)
15:25:05 <tedg> K, I was avoiding changing the codebase too much, but since andyrock moved the .conf file into the build system we can move it to lib.
15:33:32 <Trevinho> tedg: yeah, that's nicer

[Ted Gould (ted)]

K, I think that's everything :-)

[Marco Trevisan (Treviño) (3v1n0)]

Still some conflicts with the parent branch, merge again please...

[Marco Trevisan (Treviño) (3v1n0)]

Also, you want me to land this or you prefer to land the branch together with the other systemd branches?

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, just still wondering if you can get rid of that static list from the .service :)

[Ted Gould (ted)]

So I removed the list and put it as a set of symbolic links in the packaging. At least then it is a packaging thing (when suggests change the links should change) more than an Upstream thing.

[Marco Trevisan (Treviño) (3v1n0)]

Mh, this is better... I would have guessed this was done at each indicator level, but I can go with this too.

One only minor thing, it shouldn't never happen that the lockscreen is there without ups running, but... For safety I think it would be better to also add

/usr/lib/systemd/user/indicator-datetime.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-datetime.service
/usr/lib/systemd/user/indicator-keyboard.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-keyboard.service
/usr/lib/systemd/user/indicator-power.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-power.service
/usr/lib/systemd/user/indicator-session.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-session.service
/usr/lib/systemd/user/indicator-sound.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-sound.service

[Ted Gould (ted)]

On Tue, 2016-08-09 at 16:09 +0000, Marco Trevisan (Treviño) wrote:
> Mh, this is better... I would have guessed this was done at each
> indicator level, but I can go with this too.
Yes, systemd is "backwards" to Upstart in that you define a state and
how to achieve that state instead of an event that you listen for. So
the state is panel-service running and you achieve that by starting the
indicators instead of the panel service asking the indicators to start.
I miss Upstart, I think it made more sense too :-(
> One only minor thing, it shouldn't never happen that the lockscreen is there without ups running, but... For safety I think it would be better to also add
>

Yup, good idea, added.

[Marco Trevisan (Treviño) (3v1n0)]

Nice, I think we can land this now!

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Ouch, I'm getting this now:

dpkg: error processing archive /tmp/apt-dpkg-install-pcRES4/3-unity_7.5.0+16.10.20160823-0ubuntu1_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/x86_64-linux-gnu/unity/makebootchart.py', which is also in package libunity-core-6.0-9:amd64 7.5.0+16.10.20160817.1-0ubuntu1

I guess this is because the unity.install +usr/lib/*/unity line, can you set it as it used to be please?

[Marco Trevisan (Treviño) (3v1n0)]

review: Needs Fixing

[Ted Gould (ted)]

Set them up to explicitly mention, looks like they end up in the right package now.

[Marco Trevisan (Treviño) (3v1n0)]

I didn't generated scripts have wrong path, you should use FULL_LIBDIR.

[/usr/lib/systemd/user/unity7.service:10] Executable path is not absolute, ignoring: lib/x86_64-linux-gnu/unity/unity-compiz-profile-select

[Marco Trevisan (Treviño) (3v1n0)]

The prefixes on the .service and .config files are still wrong... See the inline comments.

Also unity7 doesn't start automatically (it does if I use systemctl manually), and I also see this:

 indicator-application.service not-found inactive dead indicator-application.service
● indicator-bluetooth.service not-found inactive dead indicator-bluetooth.service
● indicator-datetime.service not-found inactive dead indicator-datetime.service
● indicator-keyboard.service not-found inactive dead indicator-keyboard.service
● indicator-messages.service not-found inactive dead indicator-messages.service
● indicator-power.service not-found inactive dead indicator-power.service
● indicator-session.service not-found inactive dead indicator-session.service
● indicator-sound.service not-found inactive dead indicator-sound.service
  unity-gtk-module.service loaded active exited Unity GTK Module Environment variables
  unity-panel-service.service loaded inactive dead Backing Service for the Unity Panel
  unity-settings-daemon.service loaded active running Unity Settings Daemon
  unity7.service loaded inactive dead Unity Shell v7
  indicators-pre.target loaded inactive dead

[Iain Lane (laney)]

Missing:

  - symlink /usr/lib/systemd/user/ubuntu-session.target.requires/unity7.service -> ../unity7.service
  - Environment=COMPIZ_CONFIG_PROFILE=ubuntu

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> - Environment=COMPIZ_CONFIG_PROFILE=ubuntu

This isn't true anymore, since the profile could also be ubnutu-lowgfx, so this has to be done from the pre-start script

[Marco Trevisan (Treviño) (3v1n0)]

> - Environment=COMPIZ_CONFIG_PROFILE=ubuntu

This isn't true anymore, since the profile could also be ubnutu-lowgfx, so this has to be done from the pre-start script

[Iain Lane (laney)]

On Wed, Aug 31, 2016 at 10:54:22AM -0000, Marco Trevisan (Treviño) wrote:
> > - Environment=COMPIZ_CONFIG_PROFILE=ubuntu
>
> This isn't true anymore, since the profile could also be ubnutu-lowgfx, so this has to be done from the pre-start script

Then make that call dbus-update-activation-environment

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Iain Lane (laney)]

On Wed, Aug 31, 2016 at 11:03:38AM -0000, Iain Lane wrote:
> On Wed, Aug 31, 2016 at 10:54:22AM -0000, Marco Trevisan (Treviño) wrote:
> > > - Environment=COMPIZ_CONFIG_PROFILE=ubuntu
> >
> > This isn't true anymore, since the profile could also be ubnutu-lowgfx, so this has to be done from the pre-start script
>
> Then make that call dbus-update-activation-environment

instead of systemctl set-environment, that is. Most jobs do

  initctl set-env -g ...
  dbus-update-activation-environment --verbose --systemd VAR

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-21 13:01:59 +0000
+++ CMakeLists.txt	2016-08-31 03:25:56 +0000
@@ -429,5 +429,15 @@
 #
 # Upstart
 #
-configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf)
+
+configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
+
+#
+# Systemd
+#
+
+configure_file(unity7.service.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.service @ONLY)
+pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.service DESTINATION ${SYSTEMD_USER_DIR})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unity7.override DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/systemd-session/upstart)
 
=== modified file 'debian/control'
--- debian/control	2016-07-25 18:20:16 +0000
+++ debian/control	2016-08-31 03:25:56 +0000
@@ -53,6 +53,7 @@
                python3 (>= 3.4),
                python-setuptools,
                quilt,
+               systemd,
                xserver-xorg-video-dummy,
                xsltproc,
 Standards-Version: 3.9.5
@@ -81,12 +82,31 @@
          libxfixes3 (>= 1:5.0.1-1),
          libxi6 (>= 2:1.7.1.901),
 	 unity-scope-home,
-Provides: indicator-renderer
 Recommends: unity-control-center,
             ${unity-default-masterscopes}
             nautilus,
             gnome-disk-utility,
-            indicator-appmenu (>= 15.02.0),
+            hud,
+            session-shortcuts,
+Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),
+        unity-lens-files (<< 5.10.0-0ubuntu2),
+        unity-lens-music (<< 6.0.0),
+        unity-lens-video (<< 0.3.6-0ubuntu2),
+Description: Interface designed for efficiency of space and interaction.
+ Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
+ community, Unity is all about the combination of familiarity and the future. We
+ bring together visual design, analysis of user experience testing, modern
+ graphics technologies and a deep understanding of the free software landscape
+ to produce what we hope will be the lightest, most elegant and most delightful
+ way to use your PC.
+
+Package: unity-services
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-common,
+Provides: indicator-renderer
+Recommends: indicator-appmenu (>= 15.02.0),
             indicator-application,
             indicator-sound,
             indicator-bluetooth,
@@ -96,24 +116,6 @@
             indicator-printers,
             indicator-power,
             indicator-session,
-            hud,
-            session-shortcuts,
-Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),
-        unity-lens-files (<< 5.10.0-0ubuntu2),
-        unity-lens-music (<< 6.0.0),
-        unity-lens-video (<< 0.3.6-0ubuntu2),
-Description: Interface designed for efficiency of space and interaction.
- Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
- community, Unity is all about the combination of familiarity and the future. We
- bring together visual design, analysis of user experience testing, modern
- graphics technologies and a deep understanding of the free software landscape
- to produce what we hope will be the lightest, most elegant and most delightful
- way to use your PC.
-
-Package: unity-services
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
 Description: Services for the Unity interface
  Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
  community, Unity is all about the combination of familiarity and the future. We
 
=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2016-07-26 16:45:34 +0000
+++ debian/libunity-core-6.0-9.install	2016-08-31 03:25:56 +0000
@@ -2,8 +2,9 @@
 usr/lib/*/unity/*.py
 usr/share/ccsm
 usr/share/gnome-control-center/
-usr/share/unity
-usr/share/upstart/sessions/unity7.conf
+usr/share/unity/icons
+usr/share/unity/themes
 debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
 debian/source_unity.py usr/share/apport/package-hooks
 tools/convert-files/* usr/lib/compiz/migration/
+usr/share/upstart/sessions/unity7.conf
 
=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2016-07-26 13:58:14 +0000
+++ debian/unity-services.install	2016-08-31 03:25:56 +0000
@@ -1,3 +1,6 @@
 usr/lib/*/unity/*service
-usr/share/upstart/sessions/unity-panel-service*.conf
+usr/share/upstart/sessions/unity-panel*
+usr/share/upstart/systemd-session/upstart/unity-panel*
+usr/lib/systemd/user/unity-panel*
+usr/lib/systemd/user/unity-screen-locked.target
 usr/share/man/*/unity-panel-service.1
 
=== added file 'debian/unity-services.links'
--- debian/unity-services.links	1970-01-01 00:00:00 +0000
+++ debian/unity-services.links	2016-08-31 03:25:56 +0000
@@ -0,0 +1,13 @@
+/usr/lib/systemd/user/indicator-application.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-application.service
+/usr/lib/systemd/user/indicator-bluetooth.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-bluetooth.service
+/usr/lib/systemd/user/indicator-datetime.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-datetime.service
+/usr/lib/systemd/user/indicator-keyboard.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-keyboard.service
+/usr/lib/systemd/user/indicator-messages.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-messages.service
+/usr/lib/systemd/user/indicator-power.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-power.service
+/usr/lib/systemd/user/indicator-session.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-session.service
+/usr/lib/systemd/user/indicator-sound.service /usr/lib/systemd/user/unity-panel-service.service.wants/indicator-sound.service
+/usr/lib/systemd/user/indicator-datetime.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-datetime.service
+/usr/lib/systemd/user/indicator-keyboard.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-keyboard.service
+/usr/lib/systemd/user/indicator-power.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-power.service
+/usr/lib/systemd/user/indicator-session.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-session.service
+/usr/lib/systemd/user/indicator-sound.service /usr/lib/systemd/user/unity-panel-service-lockscreen.service.wants/indicator-sound.service
 
=== modified file 'debian/unity.install'
--- debian/unity.install	2016-07-26 16:45:34 +0000
+++ debian/unity.install	2016-08-31 03:25:56 +0000
@@ -2,6 +2,9 @@
 usr/bin
 usr/lib/*/compiz/libunity*.so
 usr/lib/*/unity/unity-active-plugins-safety-check
+usr/lib/*/unity/unity-compiz-profile-select
 usr/share/man/*/unity.1
 usr/share/compiz
 usr/share/locale
+usr/lib/systemd/user/unity7.service
+usr/share/upstart/systemd-session/upstart/unity7.override
 
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2016-07-04 12:45:06 +0000
+++ lockscreen/LockScreenController.cpp	2016-08-31 03:25:56 +0000
@@ -56,6 +56,7 @@
 Controller::Controller(DBusManager::Ptr const& dbus_manager,
                        session::Manager::Ptr const& session_manager,
                        key::Grabber::Ptr const& key_grabber,
+                       SystemdWrapper::Ptr const& systemd_wrapper,
                        UpstartWrapper::Ptr const& upstart_wrapper,
                        ShieldFactoryInterface::Ptr const& shield_factory,
                        bool test_mode)
@@ -63,6 +64,7 @@
   , dbus_manager_(dbus_manager)
   , session_manager_(session_manager)
   , key_grabber_(key_grabber)
+  , systemd_wrapper_(systemd_wrapper)
   , upstart_wrapper_(upstart_wrapper)
   , shield_factory_(shield_factory)
   , suspend_inhibitor_manager_(std::make_shared<SuspendInhibitorManager>())
@@ -129,6 +131,7 @@
       shields_.clear();
 
       upstart_wrapper_->Emit("desktop-unlock");
+      systemd_wrapper_->Stop("unity-screen-locked.target");
       accelerator_controller_.reset();
       indicators_.reset();
     }
@@ -464,6 +467,7 @@
 {
   indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
   upstart_wrapper_->Emit("desktop-lock");
+  systemd_wrapper_->Stop("unity-screen-locked.target");
 
   accelerator_controller_ = std::make_shared<AcceleratorController>(key_grabber_);
   auto activate_key = WindowManager::Default().activate_indicators_key();
 
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2016-06-21 01:28:26 +0000
+++ lockscreen/LockScreenController.h	2016-08-31 03:25:56 +0000
@@ -31,6 +31,7 @@
 #include "ScreenSaverDBusManager.h"
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/KeyGrabber.h"
+#include "unity-shared/SystemdWrapper.h"
 #include "unity-shared/UpstartWrapper.h"
 
 namespace unity
@@ -46,6 +47,7 @@
   typedef std::shared_ptr<Controller> Ptr;
 
   Controller(DBusManager::Ptr const&, session::Manager::Ptr const&, key::Grabber::Ptr const&,
+             SystemdWrapper::Ptr const& systemd_wrapper = std::make_shared<SystemdWrapper>(),
              UpstartWrapper::Ptr const& upstart_wrapper = std::make_shared<UpstartWrapper>(),
              ShieldFactoryInterface::Ptr const& shield_factory = std::make_shared<ShieldFactory>(),
              bool test_mode = false);
@@ -88,6 +90,7 @@
   key::Grabber::Ptr key_grabber_;
   indicator::Indicators::Ptr indicators_;
   AcceleratorController::Ptr accelerator_controller_;
+  SystemdWrapper::Ptr systemd_wrapper_;
   UpstartWrapper::Ptr upstart_wrapper_;
   ShieldFactoryInterface::Ptr shield_factory_;
   SuspendInhibitorManager::Ptr suspend_inhibitor_manager_;
 
=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ services/CMakeLists.txt	2016-08-31 03:25:56 +0000
@@ -58,3 +58,34 @@
 
 configure_file(unity-panel-service-lockscreen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
+
+##
+##  Systemd Unit Files
+##
+
+# where to install
+# Uncomment when we drop Vivid
+# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
+set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
+message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
+
+configure_file (unity-panel-service.service.in "${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.service")
+configure_file (unity-panel-service-lockscreen.service.in "${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.service")
+
+install( FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.service"
+         "${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.service"
+         "${CMAKE_CURRENT_SOURCE_DIR}/unity-screen-locked.target"
+         DESTINATION "${SYSTEMD_USER_DIR}")
+
+##
+##  Upstart systemd override Job File
+##
+
+set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
+message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir")
+
+install (FILES 
+		 unity-panel-service.override
+		 unity-panel-service-lockscreen.override
+         DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
 
=== added file 'services/unity-panel-service-lockscreen.override'
--- services/unity-panel-service-lockscreen.override	1970-01-01 00:00:00 +0000
+++ services/unity-panel-service-lockscreen.override	2016-08-31 03:25:56 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'services/unity-panel-service-lockscreen.service.in'
--- services/unity-panel-service-lockscreen.service.in	1970-01-01 00:00:00 +0000
+++ services/unity-panel-service-lockscreen.service.in	2016-08-31 03:25:56 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Backing Service for the Unity Panel in Lockscreen mode
+PartOf=unity-screen-locked.target
+
+[Service]
+ExecStart=${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode
+Restart=on-failure
 
=== added file 'services/unity-panel-service.override'
--- services/unity-panel-service.override	1970-01-01 00:00:00 +0000
+++ services/unity-panel-service.override	2016-08-31 03:25:56 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'services/unity-panel-service.service.in'
--- services/unity-panel-service.service.in	1970-01-01 00:00:00 +0000
+++ services/unity-panel-service.service.in	2016-08-31 03:25:56 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=Backing Service for the Unity Panel
+After=unity7.service
+PartOf=graphical-session.target
+BindsTo=indicators-pre.target
+
+[Service]
+ExecStart=${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service
+Restart=on-failure
 
=== added file 'services/unity-screen-locked.target'
--- services/unity-screen-locked.target	1970-01-01 00:00:00 +0000
+++ services/unity-screen-locked.target	2016-08-31 03:25:56 +0000
@@ -0,0 +1,4 @@
+[Unit]
+Description=A target that, when running, represents the screen being locked
+Wants=ubuntu-panel-service-lock.service
+PartOf=graphical-session.target
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-12-17 22:32:37 +0000
+++ tests/CMakeLists.txt	2016-08-31 03:25:56 +0000
@@ -286,6 +286,7 @@
                  test_switcher_controller_class.cpp
                  test_switcher_model.cpp
                  test_switcher_view.cpp
+                 test_systemd_wrapper.cpp
                  test_tabiterator.cpp
                  test_texture_cache.cpp
                  test_text_input.cpp
 
=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2016-06-21 14:40:26 +0000
+++ tests/test_lockscreen_controller.cpp	2016-08-31 03:25:56 +0000
@@ -83,9 +83,10 @@
     , session_manager(std::make_shared<NiceMock<session::MockManager>>())
     , key_grabber(std::make_shared<key::MockGrabber::Nice>())
     , dbus_manager(std::make_shared<DBusManager>(session_manager))
+    , systemd_wrapper(std::make_shared<SystemdWrapper>())
     , upstart_wrapper(std::make_shared<UpstartWrapper>())
     , shield_factory(std::make_shared<ShieldFactoryMock>())
-    , controller(dbus_manager, session_manager, key_grabber, upstart_wrapper, shield_factory)
+    , controller(dbus_manager, session_manager, key_grabber, systemd_wrapper, upstart_wrapper, shield_factory)
   {}
 
   struct ControllerWrap : Controller
@@ -93,9 +94,10 @@
     ControllerWrap(DBusManager::Ptr const& dbus_manager,
                    session::Manager::Ptr const& session_manager,
                    key::Grabber::Ptr const& key_grabber,
+                   SystemdWrapper::Ptr const& systemd_wrapper,
                    UpstartWrapper::Ptr const& upstart_wrapper,
                    ShieldFactoryInterface::Ptr const& shield_factory)
-      : Controller(dbus_manager, session_manager, key_grabber, upstart_wrapper, shield_factory, /* test_mode */ true)
+      : Controller(dbus_manager, session_manager, key_grabber, systemd_wrapper, upstart_wrapper, shield_factory, /* test_mode */ true)
     {}
 
     using Controller::shields_;
@@ -112,6 +114,7 @@
   session::MockManager::Ptr session_manager;
   key::MockGrabber::Ptr key_grabber;
   DBusManager::Ptr dbus_manager;
+  unity::SystemdWrapper::Ptr systemd_wrapper;
   unity::UpstartWrapper::Ptr upstart_wrapper;
 
   ShieldFactoryMock::Ptr shield_factory;
 
=== added file 'tests/test_systemd_wrapper.cpp'
--- tests/test_systemd_wrapper.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_systemd_wrapper.cpp	2016-08-31 03:25:56 +0000
@@ -0,0 +1,111 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (c) 2016 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Ted Gould <[e-mail]>
+*/
+
+#include <gtest/gtest.h>
+using namespace testing;
+
+#include "unity-shared/SystemdWrapper.h"
+
+#include <UnityCore/GLibDBusServer.h>
+#include <UnityCore/Variant.h>
+
+#include "test_utils.h"
+
+namespace
+{
+
+const std::string SYSTEMD =
+R"(<node>
+  <interface name="org.freedesktop.systemd1.Manager">
+    <method name="StartUnit">
+      <arg name="name" type="s" direction="in" />
+      <arg name="mode" type="s" direction="in" />
+      <arg name="job" type="o" direction="out" />
+    </method>
+    <method name="StopUnit">
+      <arg name="name" type="s" direction="in" />
+      <arg name="mode" type="s" direction="in" />
+      <arg name="job" type="o" direction="out" />
+    </method>
+  </interface>
+</node>)";
+
+struct MockSystemdWrapper : unity::SystemdWrapper {
+  MockSystemdWrapper()
+    : SystemdWrapper(SystemdWrapper::TestMode())
+  {}
+};
+
+struct TestSystemdWrapper : public Test
+{
+  TestSystemdWrapper()
+  {
+    systemd_server_ = std::make_shared<unity::glib::DBusServer>("com.canonical.Unity.Test.Systemd");
+    systemd_server_->AddObjects(SYSTEMD, "/org/freedesktop/systemd1");
+
+    Utils::WaitUntilMSec([this] { return systemd_server_->IsConnected(); });
+    Utils::WaitUntilMSec([this] { return systemd_wrapper_.IsConnected(); });
+  }
+
+  unity::glib::DBusServer::Ptr systemd_server_;
+  MockSystemdWrapper systemd_wrapper_;
+};
+
+
+TEST_F(TestSystemdWrapper, Start)
+{
+  bool start_sent = false;
+
+  systemd_server_->GetObjects().front()->SetMethodsCallsHandler([&] (std::string const& method, GVariant* par) -> GVariant* {
+    if (method == "StartUnit")
+    {
+      start_sent = true;
+
+      std::string event_name = glib::Variant(g_variant_get_child_value(par, 0)).GetString();
+      EXPECT_EQ("unity-screen-locked", event_name);
+    }
+
+    return nullptr;
+  });
+
+  systemd_wrapper_.Start("unity-screen-locked");
+  Utils::WaitUntil(start_sent);
+}
+
+TEST_F(TestSystemdWrapper, Stop)
+{
+  bool stop_sent = false;
+
+  systemd_server_->GetObjects().front()->SetMethodsCallsHandler([&] (std::string const& method, GVariant* par) -> GVariant* {
+    if (method == "StopUnit")
+    {
+      stop_sent = true;
+
+      std::string event_name = glib::Variant(g_variant_get_child_value(par, 0)).GetString();
+      EXPECT_EQ("unity-screen-locked", event_name);
+    }
+
+    return nullptr;
+  });
+
+  systemd_wrapper_.Stop("unity-screen-locked");
+  Utils::WaitUntil(stop_sent);
+}
+
+}
 
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-07-18 17:26:01 +0000
+++ tools/CMakeLists.txt	2016-08-31 03:25:56 +0000
@@ -28,3 +28,6 @@
 add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_check.cpp)
 target_link_libraries(unity-active-plugins-safety-check ${LIBS})
 install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
+
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity-compiz-profile-select.in ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select @ONLY)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
 
=== added file 'tools/unity-compiz-profile-select.in'
--- tools/unity-compiz-profile-select.in	1970-01-01 00:00:00 +0000
+++ tools/unity-compiz-profile-select.in	2016-08-31 03:25:56 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# If gnome-session is going to start compiz,
+# we don't want to be the ones doing it.
+
+if grep -q compiz /usr/share/gnome-session/sessions/ubuntu.session ; then
+  echo "GNOME Session is starting Compiz"
+  stop ; exit 0
+fi
+
+compiz_profile="ubuntu"
+
+if ! /usr/lib/nux/unity_support_test -p; then
+  compiz_profile="ubuntu-lowgfx"
+fi
+
+echo "Using compiz profile '$compiz_profile'"
+
+initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
+systemctl set-environment --user COMPIZ_CONFIG_PROFILE="$compiz_profile"
+
+export COMPIZ_CONFIG_PROFILE="$compiz_profile"
+exec @CMAKE_INSTALL_FULL_LIBDIR@/unity/unity-active-plugins-safety-check
 
=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2016-08-12 11:21:48 +0000
+++ unity-shared/CMakeLists.txt	2016-08-31 03:25:56 +0000
@@ -60,6 +60,7 @@
      SpreadFilter.cpp
      SpreadWidgets.cpp
      StaticCairoText.cpp
+     SystemdWrapper.cpp
      TextureCache.cpp
      TextInput.cpp
      TextureThumbnailProvider.cpp
 
=== added file 'unity-shared/SystemdWrapper.cpp'
--- unity-shared/SystemdWrapper.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/SystemdWrapper.cpp	2016-08-31 03:25:56 +0000
@@ -0,0 +1,103 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 3 -*-
+/*
+* Copyright © 2016 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Ted Gould <[e-mail]>
+*/
+
+#include "SystemdWrapper.h"
+
+#include <UnityCore/GLibDBusProxy.h>
+
+namespace unity
+{
+
+//
+// Start private implementation
+//
+
+class SystemdWrapper::Impl
+{
+public:
+  Impl(bool test);
+
+  void Start(std::string const& name);
+  void Stop(std::string const& name);
+  bool IsConnected();
+
+private:
+  glib::DBusProxy::Ptr systemd_proxy_;
+};
+
+SystemdWrapper::Impl::Impl(bool test)
+{
+  std::string busname = "org.freedesktop.systemd1";
+  if (test) {
+    busname = "com.canonical.Unity.Test.Systemd";
+  }
+
+  systemd_proxy_ = std::make_shared<unity::glib::DBusProxy>(busname, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
+}
+
+void SystemdWrapper::Impl::Start(std::string const& name)
+{
+  if (IsConnected()) {
+    systemd_proxy_->Call("StartUnit", g_variant_new("(ss)", name.c_str(), "replace"));
+  }
+}
+
+void SystemdWrapper::Impl::Stop(std::string const& name)
+{
+  if (IsConnected()) {
+    systemd_proxy_->Call("StopUnit", g_variant_new("(ss)", name.c_str(), "replace"));
+  }
+}
+
+bool SystemdWrapper::Impl::IsConnected()
+{
+  return systemd_proxy_->IsConnected();
+}
+
+//
+// End private implementation
+//
+
+SystemdWrapper::SystemdWrapper()
+  : pimpl_(new Impl(false))
+{}
+
+SystemdWrapper::SystemdWrapper(SystemdWrapper::TestMode const& tm)
+  : pimpl_(new Impl(true))
+{}
+
+SystemdWrapper::~SystemdWrapper()
+{}
+
+void SystemdWrapper::Start(std::string const& name)
+{
+  pimpl_->Start(name);
+}
+
+void SystemdWrapper::Stop(std::string const& name)
+{
+  pimpl_->Stop(name);
+}
+
+bool SystemdWrapper::IsConnected()
+{
+  return pimpl_->IsConnected();
+}
+
+}
 
=== added file 'unity-shared/SystemdWrapper.h'
--- unity-shared/SystemdWrapper.h	1970-01-01 00:00:00 +0000
+++ unity-shared/SystemdWrapper.h	2016-08-31 03:25:56 +0000
@@ -0,0 +1,55 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright © 2016 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Ted Gould <[e-mail]>
+*/
+
+#ifndef UNITY_SYSTEMD_WRAPPER
+#define UNITY_SYSTEMD_WRAPPER
+
+#include <memory>
+
+namespace unity
+{
+
+class SystemdWrapper
+{
+public:
+  typedef std::shared_ptr<SystemdWrapper> Ptr;
+
+  SystemdWrapper();
+  ~SystemdWrapper();
+
+  void Start(std::string const& name);
+  void Stop(std::string const& name);
+  bool IsConnected();
+
+protected:
+  struct TestMode {};
+  SystemdWrapper(TestMode const&);
+
+private:
+  // Noncopyable
+  SystemdWrapper(SystemdWrapper const&) = delete;
+  SystemdWrapper& operator=(SystemdWrapper const&) = delete;
+
+  class Impl;
+  std::unique_ptr<Impl> pimpl_;
+};
+
+}
+
+#endif
 
=== modified file 'unity7.conf.in'
--- unity7.conf.in	2016-07-21 13:01:59 +0000
+++ unity7.conf.in	2016-08-31 03:25:56 +0000
@@ -4,27 +4,7 @@
 start on xsession SESSION=ubuntu and started unity-settings-daemon
 stop on desktop-end
 
-pre-start script
-  # If gnome-session is going to start compiz,
-  # we don't want to be the ones doing it.
-
-  if grep -q compiz /usr/share/gnome-session/sessions/ubuntu.session ; then
-    echo "GNOME Session is starting Compiz"
-    stop ; exit 0
-  fi
-
-  compiz_profile="ubuntu"
-
-  if ! /usr/lib/nux/unity_support_test -p; then
-    compiz_profile="ubuntu-lowgfx"
-  fi
-
-  echo "Using compiz profile '$compiz_profile'"
-  initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
-  export COMPIZ_CONFIG_PROFILE="$compiz_profile"
-
-  ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-active-plugins-safety-check
-end script
+pre-start exec @CMAKE_INSTALL_FULL_LIBDIR@/unity-compiz-profile-select
 
 respawn
 exec compiz
 
=== added file 'unity7.override'
--- unity7.override	1970-01-01 00:00:00 +0000
+++ unity7.override	2016-08-31 03:25:56 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'unity7.service.in'
--- unity7.service.in	1970-01-01 00:00:00 +0000
+++ unity7.service.in	2016-08-31 03:25:56 +0000
@@ -0,0 +1,11 @@
+[Unit]
+Description=Unity Shell v7
+Requires=unity-settings-daemon.service unity-panel-service.service bamfdaemon.service
+Wants=unity-gtk-module.service
+After=unity-settings-daemon.service
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/compiz
+ExecStartPre=@CMAKE_INSTALL_FULL_LIBDIR@/unity-compiz-profile-select
+Restart=on-failure