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

[Ted Gould]

Adding systemd user session units

[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

[lp:~ted/unity/systemd-unit.]

4157. By Ted Gould on 2016-07-20

Adding script that both Upstart and systemd can use

4158. By Ted Gould on 2016-07-20

Add systemd events to the lock screen

4159. By Ted Gould on 2016-07-20

Grabbing the saftey check branch

4160. By Ted Gould on 2016-07-20

Switch to everything using the same shell script

4161. By Ted Gould on 2016-07-20

Setup a test for the systemd wrapper

4162. By Ted Gould on 2016-07-20

Make sure to grab the utilities for the unity init jobs

4163. By Ted Gould on 2016-07-20

Fixing location of the target

4164. By Ted Gould on 2016-07-20

Handling multiarch

4165. By Ted Gould on 2016-07-20

Moving the upstart and systemd jobs to the unity package

4166. By Ted Gould on 2016-07-20

Making sure we don't pick up the tool twice

4167. By Ted Gould on 2016-07-22

Forgot the 'wants' section, also fixing the control file to have the indicators depend on the panel service instead of the core WM

4168. By Ted Gould on 2016-07-22

Shouldn't have changed

4169. By Ted Gould on 2016-07-22

Adding a compiz config build dependency

4170. By Ted Gould on 2016-07-26

Grabbing updates of Andy's branch

4171. By Ted Gould on 2016-07-26

Move the systemd configuration variables out of the debian directory

4172. By Ted Gould on 2016-07-26

Move and rename profile selection tool

4173. By Ted Gould on 2016-07-26

Fix the service includes

4174. By Ted Gould on 2016-07-26

Check to see if the proxy is connected before sending a message to it

4175. By Ted Gould on 2016-08-01

Merge trunk

4176. By Ted Gould on 2016-08-01

Keep the upstart job in libcore

4177. By Ted Gould on 2016-08-09

Switch from a list of wants to a packaging setting up symbolic links

4178. By Ted Gould on 2016-08-09

Add indicators for lock screen

4179. By Ted Gould on 2016-08-12

Add a function to check whether we're connected so the test can wait and ensure we are before running

4180. By Ted Gould on 2016-08-30

Explicitly list binaries in unity.install

4181. By Ted Gould on 2016-08-30

Remove pre dot

4182. By Ted Gould on 2016-08-31

Use the full libdir

4183. By Ted Gould on 2016-08-31

Ensure the profile select tool works

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-03-21 15:38:17 +0000
+++ debian/control	2016-07-20 15:08:18 +0000
@@ -52,6 +52,7 @@
                python3 (>= 3.4),
                python-setuptools,
                quilt,
+               systemd,
                xserver-xorg-video-dummy,
                xsltproc,
 Standards-Version: 3.9.5
@@ -127,6 +128,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends},
+         indicator-common,
 Replaces: libunity-core-6.0-9 (<< 7.3.0),
 Breaks: libunity-core-6.0-9 (<< 7.3.0),
 Description: Interface designed for efficiency of space and interaction.

=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2016-02-09 01:26:22 +0000
+++ debian/libunity-core-6.0-9.install	2016-07-20 15:08:18 +0000
@@ -6,4 +6,6 @@
 debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
 debian/source_unity.py usr/share/apport/package-hooks
 debian/unity7.conf usr/share/upstart/sessions
+debian/unity7.service usr/lib/systemd/user
+debian/unity7.override usr/share/upstart/systemd-session/upstart
 tools/convert-files/* usr/lib/compiz/migration/

=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2016-02-09 01:26:22 +0000
+++ debian/unity-services.install	2016-07-20 15:08:18 +0000
@@ -1,3 +1,4 @@
 usr/lib/*/unity/*service
 usr/share/upstart
+usr/lib/systemd
 usr/share/man/*/unity-panel-service.1

=== modified file 'debian/unity7.conf'
--- debian/unity7.conf	2016-07-05 01:26:04 +0000
+++ debian/unity7.conf	2016-07-20 15:08:18 +0000
@@ -4,24 +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"
-end script
+pre-start exec /usr/lib/unity/unity-compiz-profile
 
 respawn
 exec compiz

=== added file 'debian/unity7.override'
--- debian/unity7.override	1970-01-01 00:00:00 +0000
+++ debian/unity7.override	2016-07-20 15:08:18 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/unity7.service'
--- debian/unity7.service	1970-01-01 00:00:00 +0000
+++ debian/unity7.service	2016-07-20 15:08:18 +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
+ExecStart.Pre=/usr/lib/unity/unity-compiz-profile
+Restart=on-failure

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2016-07-04 12:45:06 +0000
+++ lockscreen/LockScreenController.cpp	2016-07-20 15:08:18 +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-07-20 15:08:18 +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 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2016-04-05 13:23:27 +0000
+++ plugins/unityshell/unityshell.xml.in	2016-07-20 15:08:18 +0000
@@ -39,6 +39,8 @@
                 <plugin>compiztoolbox</plugin>
                 <plugin>scale</plugin>
                 <plugin>expo</plugin>
+                <plugin>move</plugin>
+                <plugin>resize</plugin>
             </requirement>
             <conflict>
                 <plugin>decor</plugin>

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ services/CMakeLists.txt	2016-07-20 15:08:18 +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_BINARY_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-07-20 15:08:18 +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-07-20 15:08:18 +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-07-20 15:08:18 +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-07-20 15:08:18 +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-07-20 15:08:18 +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/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2016-06-21 14:40:26 +0000
+++ tests/test_lockscreen_controller.cpp	2016-07-20 15:08:18 +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;

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ tools/CMakeLists.txt	2016-07-20 15:08:18 +0000
@@ -6,3 +6,27 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
 GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+#
+# unity-active-plugins-safety-check
+#
+pkg_check_modules(UAPSC_DEPS REQUIRED libcompizconfig)
+
+set(CFLAGS
+    ${UAPSC_DEPS_CFLAGS}
+    ${UAPSC_DEPS_CFLAGS_OTHER}
+    )
+
+string (REPLACE ";" " " CFLAGS "${CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
+
+set(LIBS ${UAPSC_DEPS_LIBRARIES})
+
+set(LIB_PATHS ${UAPSC_DEPS_LIBRARY_DIRS})
+link_directories(${LIB_PATHS})
+
+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/)
+
+install(FILES unity-compiz-profile DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)

=== added file 'tools/unity-compiz-profile'
--- tools/unity-compiz-profile	1970-01-01 00:00:00 +0000
+++ tools/unity-compiz-profile	2016-07-20 15:08:18 +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 /usr/lib/unity/unity-active-plugins-safety-check

=== added file 'tools/unity_active_plugins_safety_check.cpp'
--- tools/unity_active_plugins_safety_check.cpp	1970-01-01 00:00:00 +0000
+++ tools/unity_active_plugins_safety_check.cpp	2016-07-20 15:08:18 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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: Andrea Azzarone <[e-mail]>
+ */
+
+#include <ccs.h>
+#include <gio/gio.h>
+
+#include <iostream>
+#include <string>
+
+extern const CCSInterfaceTable ccsDefaultInterfaceTable;
+
+void PluginSetActiveWithDeps(CCSContext* context, std::string const& plugin_name)
+{
+  if (plugin_name.empty())
+    return;
+
+  auto plugin = ccsFindPlugin(context, plugin_name.c_str());
+
+  if (!plugin)
+    return;
+
+  auto reqs = ccsPluginGetRequiresPlugins(plugin);
+  for (auto req = reqs; req; req = req->next)
+  {
+    if (req->data && req->data->value)
+    {
+      std::string name = req->data->value;
+      PluginSetActiveWithDeps(context, name.c_str());
+    }
+  }
+
+  if (!ccsPluginIsActive(context, plugin_name.c_str())) {
+    std::cout << "Setting plugin '" << plugin_name << "' to active" << std::endl;
+    ccsPluginSetActive(plugin, true);
+  }
+
+  auto conflicts = ccsPluginGetConflictPlugins(plugin);
+  for (auto con = conflicts; con; con = con->next)
+  {
+    if (con->data && con->data->value)
+    {
+      std::string name = con->data->value;
+      auto plugin = ccsFindPlugin(context, name.c_str());
+
+      if (ccsPluginIsActive(context, name.c_str()))
+      {
+        std::cout << "Setting plugin '" << name << "' to non-active" << std::endl;
+        ccsPluginSetActive(plugin, false);
+      }
+    }
+  }
+}
+
+int main()
+{
+  auto context = ccsContextNew (0, &ccsDefaultInterfaceTable);
+
+  if (!context)
+    return -1;
+
+  PluginSetActiveWithDeps(context, "unityshell");
+
+  ccsWriteChangedSettings(context);
+  g_settings_sync();
+  ccsFreeContext(context);
+
+  return 0;
+}

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2016-02-25 15:59:41 +0000
+++ unity-shared/CMakeLists.txt	2016-07-20 15:08:18 +0000
@@ -59,6 +59,7 @@
      SearchBarSpinner.cpp
      SpreadFilter.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-07-20 15:08:18 +0000
@@ -0,0 +1,88 @@
+// -*- 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();
+
+  void Start(std::string const& name);
+  void Stop(std::string const& name);
+
+private:
+  glib::DBusProxy::Ptr systemd_proxy_;
+};
+
+SystemdWrapper::Impl::Impl()
+{
+  std::string busname = "org.freedesktop.systemd1";
+  if (g_getenv("UNITY_TEST_SYSTEMD)")) {
+    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)
+{
+  systemd_proxy_->Call("StartUnit", g_variant_new("(ss)", name.c_str(), "replace"));
+}
+
+void SystemdWrapper::Impl::Stop(std::string const& name)
+{
+  systemd_proxy_->Call("StopUnit", g_variant_new("(ss)", name.c_str(), "replace"));
+}
+
+//
+// End private implementation
+//
+
+SystemdWrapper::SystemdWrapper()
+  : pimpl_(new Impl)
+{}
+
+SystemdWrapper::SystemdWrapper(SystemdWrapper::TestMode const& tm)
+  : pimpl_(new Impl)
+{}
+
+SystemdWrapper::~SystemdWrapper()
+{}
+
+void SystemdWrapper::Start(std::string const& name)
+{
+  pimpl_->Start(name);
+}
+
+void SystemdWrapper::Stop(std::string const& name)
+{
+  pimpl_->Stop(name);
+}
+
+}

=== added file 'unity-shared/SystemdWrapper.h'
--- unity-shared/SystemdWrapper.h	1970-01-01 00:00:00 +0000
+++ unity-shared/SystemdWrapper.h	2016-07-20 15:08:18 +0000
@@ -0,0 +1,54 @@
+// -*- 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);
+
+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