diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-09-29 20:33:31 +0100 |
---|---|---|
committer | Ondrej Holy <oholy@redhat.com> | 2015-09-30 15:20:37 +0200 |
commit | dc7040d7f8b81658817b0a633092f85a4f4963fd (patch) | |
tree | ecf98324a51768bb4225351280ccb168215d2548 /monitor | |
parent | 957fff5be2b3cb2a3356955f5c51c94bcd256fed (diff) | |
download | gvfs-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 'monitor')
21 files changed, 190 insertions, 24 deletions
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am index 0be5f12f..bde7a903 100644 --- a/monitor/afc/Makefile.am +++ b/monitor/afc/Makefile.am @@ -35,13 +35,26 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.AfcVolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-afc-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) - -DISTCLEANFILES = $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = $(service_in_files) afc.monitor +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) +EXTRA_DIST = \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/afc/gvfs-afc-volume-monitor.service.in b/monitor/afc/gvfs-afc-volume-monitor.service.in new file mode 100644 index 00000000..14fbed81 --- /dev/null +++ b/monitor/afc/gvfs-afc-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - Apple File Conduit monitor + +[Service] +ExecStart=@libexecdir@/gvfs-afc-volume-monitor +Type=dbus +BusName=org.gtk.vfs.AfcVolumeMonitor diff --git a/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in b/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in index 40e84f2e..297eea32 100644 --- a/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in +++ b/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in @@ -1,4 +1,5 @@ [D-BUS Service] Name=org.gtk.vfs.AfcVolumeMonitor Exec=@libexecdir@/gvfs-afc-volume-monitor +SystemdService=gvfs-afc-volume-monitor.service diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am index e483b947..0c5c4e8b 100644 --- a/monitor/gdu/Makefile.am +++ b/monitor/gdu/Makefile.am @@ -43,10 +43,26 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.GduVolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-gdu-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = $(service_in_files) gdu.monitor +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) + +EXTRA_DIST = \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/gdu/gvfs-gdu-volume-monitor.service.in b/monitor/gdu/gvfs-gdu-volume-monitor.service.in new file mode 100644 index 00000000..f25309db --- /dev/null +++ b/monitor/gdu/gvfs-gdu-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - GNOME Disk Utility monitor + +[Service] +ExecStart=@libexecdir@/gvfs-gdu-volume-monitor +Type=dbus +BusName=org.gtk.vfs.GduVolumeMonitor diff --git a/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in b/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in index f0534910..be73c456 100644 --- a/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in +++ b/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.GduVolumeMonitor Exec=@libexecdir@/gvfs-gdu-volume-monitor +SystemdService=gvfs-gdu-volume-monitor.service diff --git a/monitor/goa/Makefile.am b/monitor/goa/Makefile.am index 1928e2e3..c1c45d9b 100644 --- a/monitor/goa/Makefile.am +++ b/monitor/goa/Makefile.am @@ -35,12 +35,26 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.GoaVolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-goa-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -DISTCLEANFILES = $(service_DATA) +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) -EXTRA_DIST = $(service_in_files) goa.monitor +EXTRA_DIST = \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/goa/gvfs-goa-volume-monitor.service.in b/monitor/goa/gvfs-goa-volume-monitor.service.in new file mode 100644 index 00000000..803d89f5 --- /dev/null +++ b/monitor/goa/gvfs-goa-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - GNOME Online Accounts monitor + +[Service] +ExecStart=@libexecdir@/gvfs-goa-volume-monitor +Type=dbus +BusName=org.gtk.vfs.GoaVolumeMonitor diff --git a/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in b/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in index 4231821e..c0f9d079 100644 --- a/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in +++ b/monitor/goa/org.gtk.vfs.GoaVolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.GoaVolumeMonitor Exec=@libexecdir@/gvfs-goa-volume-monitor +SystemdService=gvfs-goa-volume-monitor.service diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am index 4a48bfe9..723fbbc3 100644 --- a/monitor/gphoto2/Makefile.am +++ b/monitor/gphoto2/Makefile.am @@ -77,10 +77,27 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.GPhoto2VolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-gphoto2-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = hal-marshal.list $(service_in_files) gphoto2.monitor +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) + +EXTRA_DIST = \ + hal-marshal.list \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/gphoto2/gvfs-gphoto2-volume-monitor.service.in b/monitor/gphoto2/gvfs-gphoto2-volume-monitor.service.in new file mode 100644 index 00000000..c74253c0 --- /dev/null +++ b/monitor/gphoto2/gvfs-gphoto2-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - digital camera monitor + +[Service] +ExecStart=@libexecdir@/gvfs-gphoto2-volume-monitor +Type=dbus +BusName=org.gtk.vfs.GPhoto2VolumeMonitor diff --git a/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in b/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in index fae13471..5c02bc58 100644 --- a/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in +++ b/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.GPhoto2VolumeMonitor Exec=@libexecdir@/gvfs-gphoto2-volume-monitor +SystemdService=gvfs-gphoto2-volume-monitor.service diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am index 53395651..888268fa 100644 --- a/monitor/hal/Makefile.am +++ b/monitor/hal/Makefile.am @@ -56,10 +56,27 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.HalVolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-hal-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = hal-marshal.list $(service_in_files) hal.monitor +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) + +EXTRA_DIST = \ + hal-marshal.list \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/hal/gvfs-hal-volume-monitor.service.in b/monitor/hal/gvfs-hal-volume-monitor.service.in new file mode 100644 index 00000000..58ed2c3c --- /dev/null +++ b/monitor/hal/gvfs-hal-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - deprecated HAL monitor + +[Service] +ExecStart=@libexecdir@/gvfs-hal-volume-monitor +Type=dbus +BusName=org.gtk.vfs.HalVolumeMonitor diff --git a/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in b/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in index 41c2802c..ac3ca809 100644 --- a/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in +++ b/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.HalVolumeMonitor Exec=@libexecdir@/gvfs-hal-volume-monitor +SystemdService=gvfs-hal-volume-monitor.service diff --git a/monitor/mtp/Makefile.am b/monitor/mtp/Makefile.am index 2796cbb5..98e64b3a 100644 --- a/monitor/mtp/Makefile.am +++ b/monitor/mtp/Makefile.am @@ -40,10 +40,26 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.MTPVolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-mtp-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = $(service_in_files) mtp.monitor +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) + +EXTRA_DIST = \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/mtp/gvfs-mtp-volume-monitor.service.in b/monitor/mtp/gvfs-mtp-volume-monitor.service.in new file mode 100644 index 00000000..0ab3a4c3 --- /dev/null +++ b/monitor/mtp/gvfs-mtp-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - Media Transfer Protocol monitor + +[Service] +ExecStart=@libexecdir@/gvfs-mtp-volume-monitor +Type=dbus +BusName=org.gtk.vfs.MTPVolumeMonitor diff --git a/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in b/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in index 5cd88475..77620d2d 100644 --- a/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in +++ b/monitor/mtp/org.gtk.vfs.MTPVolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.MTPVolumeMonitor Exec=@libexecdir@/gvfs-mtp-volume-monitor +SystemdService=gvfs-mtp-volume-monitor.service diff --git a/monitor/udisks2/Makefile.am b/monitor/udisks2/Makefile.am index 7dd347ad..5c0a8016 100644 --- a/monitor/udisks2/Makefile.am +++ b/monitor/udisks2/Makefile.am @@ -48,10 +48,27 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gtk.vfs.UDisks2VolumeMonitor.service.in service_DATA = $(service_in_files:.service.in=.service) +systemd_userdir = ${prefix}/lib/systemd/user +systemd_user_in_files = gvfs-udisks2-volume-monitor.service.in +systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) + $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -clean-local: - rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) +$(systemd_user_DATA): $(systemd_user_in_files) Makefile + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = $(service_in_files) udisks2.monitor what-is-shown.txt +CLEANFILES = \ + *~ \ + *.loT \ + $(BUILT_SOURCES) \ + $(service_DATA) \ + $(systemd_user_DATA) \ + $(NULL) + +EXTRA_DIST = \ + what-is-shown.txt \ + $(service_in_files) \ + $(systemd_user_in_files) \ + $(remote_volume_monitors_DATA) \ + $(NULL) diff --git a/monitor/udisks2/gvfs-udisks2-volume-monitor.service.in b/monitor/udisks2/gvfs-udisks2-volume-monitor.service.in new file mode 100644 index 00000000..65a639c5 --- /dev/null +++ b/monitor/udisks2/gvfs-udisks2-volume-monitor.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Virtual filesystem service - disk device monitor + +[Service] +ExecStart=@libexecdir@/gvfs-udisks2-volume-monitor +Type=dbus +BusName=org.gtk.vfs.UDisks2VolumeMonitor diff --git a/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in b/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in index 22a0bde9..c3f2ef69 100644 --- a/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in +++ b/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.gtk.vfs.UDisks2VolumeMonitor Exec=@libexecdir@/gvfs-udisks2-volume-monitor +SystemdService=gvfs-udisks2-volume-monitor.service |