summaryrefslogtreecommitdiff
path: root/metadata
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-09-29 20:33:31 +0100
committerOndrej Holy <oholy@redhat.com>2015-09-30 15:20:37 +0200
commitdc7040d7f8b81658817b0a633092f85a4f4963fd (patch)
treeecf98324a51768bb4225351280ccb168215d2548 /metadata
parent957fff5be2b3cb2a3356955f5c51c94bcd256fed (diff)
downloadgvfs-dc7040d7f8b81658817b0a633092f85a4f4963fd.tar.gz
Add a corresponding systemd user service for every D-Bus session service
When using "systemd --user" in conjunction with "dbus-daemon --session --systemd-activation", this ensures that each daemon is correctly placed in its own cgroup, instead of being treated as part of dbus.service. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=755760
Diffstat (limited to 'metadata')
-rw-r--r--metadata/Makefile.am6
-rw-r--r--metadata/gvfs-metadata.service.in7
-rw-r--r--metadata/org.gtk.vfs.Metadata.service.in1
3 files changed, 14 insertions, 0 deletions
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 9490cd6c..e15e40e8 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -72,12 +72,18 @@ servicedir = $(DBUS_SERVICE_DIR)
service_in_files = org.gtk.vfs.Metadata.service.in
service_DATA = org.gtk.vfs.Metadata.service
+systemd_userdir = ${prefix}/lib/systemd/user
+systemd_user_in_files = gvfs-metadata.service.in
+systemd_user_DATA = gvfs-metadata.service
+
EXTRA_DIST = \
$(service_in_files) \
+ $(systemd_user_in_files) \
dbus-interface.xml \
$(NULL)
CLEANFILES = \
$(dbus_built_sources) \
$(service_DATA) \
+ $(systemd_user_DATA) \
$(NULL)
diff --git a/metadata/gvfs-metadata.service.in b/metadata/gvfs-metadata.service.in
new file mode 100644
index 00000000..323728f0
--- /dev/null
+++ b/metadata/gvfs-metadata.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=Virtual filesystem metadata service
+
+[Service]
+ExecStart=@libexecdir@/gvfsd-metadata
+Type=dbus
+BusName=org.gtk.vfs.Metadata
diff --git a/metadata/org.gtk.vfs.Metadata.service.in b/metadata/org.gtk.vfs.Metadata.service.in
index 98932371..40d4235b 100644
--- a/metadata/org.gtk.vfs.Metadata.service.in
+++ b/metadata/org.gtk.vfs.Metadata.service.in
@@ -1,3 +1,4 @@
[D-BUS Service]
Name=org.gtk.vfs.Metadata
Exec=@libexecdir@/gvfsd-metadata
+SystemdService=gvfs-metadata.service