summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2020-07-15 18:07:42 +0200
committerBenjamin Berg <benjamin@sipsolutions.net>2020-07-31 08:54:40 +0000
commit8b58f3ea09c8ee4ce1b20e1c4fae35069718cce6 (patch)
treee7fb46b3970b409949795a01debb6f138679d22b /data
parentfab051841f082fc160438f1f8cf9afc465a33dfa (diff)
downloadgnome-session-8b58f3ea09c8ee4ce1b20e1c4fae35069718cce6.tar.gz
data: Add ready target for X11 services
This is a bit painful, but to do proper shutdown, we need an After=gnome-session-x11-services.target, but we also need to be able to tell gnome-shell when the services are ready. So add a special gnome-session-x11-services-ready.target which will be used by org.gnome.SettingsDaemon.XSettings.service.
Diffstat (limited to 'data')
-rw-r--r--data/gnome-session-x11-services-ready.target8
-rw-r--r--data/gnome-session-x11-services.target5
-rw-r--r--data/meson.build1
3 files changed, 13 insertions, 1 deletions
diff --git a/data/gnome-session-x11-services-ready.target b/data/gnome-session-x11-services-ready.target
new file mode 100644
index 00000000..371e1730
--- /dev/null
+++ b/data/gnome-session-x11-services-ready.target
@@ -0,0 +1,8 @@
+[Unit]
+Description=GNOME session X11 services
+DefaultDependencies=no
+
+BindsTo=gnome-session-x11-services.target
+After=gnome-session-x11-services.target
+
+Before=gnome-session.target
diff --git a/data/gnome-session-x11-services.target b/data/gnome-session-x11-services.target
index 520f85a0..5c63db5f 100644
--- a/data/gnome-session-x11-services.target
+++ b/data/gnome-session-x11-services.target
@@ -5,4 +5,7 @@ DefaultDependencies=no
Requisite=gnome-session-initialized.target
After=gnome-session-initialized.target
PartOf=gnome-session-initialized.target
-Before=gnome-session.target
+
+Requisite=gnome-session-x11-services-ready.target
+Before=gnome-session-x11-services-ready.target
+PartOf=gnome-session-x11-services-ready.target
diff --git a/data/meson.build b/data/meson.build
index 2cc62cd0..213ce22d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -113,6 +113,7 @@ if enable_systemd_session
'gnome-session-x11@.target',
'gnome-session-x11.target',
'gnome-session-x11-services.target',
+ 'gnome-session-x11-services-ready.target',
'gnome-session@.target',
'gnome-session.target',
'gnome-session-pre.target',