summaryrefslogtreecommitdiff
path: root/plugins/meson.build
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2021-01-20 16:32:41 +0100
committerCarlos Garnacho <carlosg@gnome.org>2021-02-14 18:47:16 +0000
commita119fdafa5f91a6ef10aec72c4ba68d3b7d539ed (patch)
treeb7cbe5ef7eaaa6576bd0e0be5de6a271faccaa8b /plugins/meson.build
parente9b98e14ae1b7915e3a13e4a3605f07360ffeff1 (diff)
downloadgnome-settings-daemon-a119fdafa5f91a6ef10aec72c4ba68d3b7d539ed.tar.gz
plugins: Use Restart=on-failure even for XSettings plugin
The move to use Restart=on-abnormal happened because gsd-xsettings would die if Xwayland shuts down. However, since gnome-shell commit 01a927f388 and related changes, we should be waiting for gsd-xsettings to shut down gracefully before Xwayland is stopped. As such, we should only hit an exit failure if from gsd-xsettings if Xwayland crashes. If gnome-shell follows up with a stop of the services within 100ms, then such a restart will not even be attempted.
Diffstat (limited to 'plugins/meson.build')
-rw-r--r--plugins/meson.build6
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/meson.build b/plugins/meson.build
index 83e01885..5d5c6e9b 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -63,11 +63,6 @@ plugin_gate_units = {
# 'smartcard': [['smartcard.target']],
}
-# Restart=on-failure is the default
-plugin_restart_rule = {
- 'xsettings' : 'on-abnormal',
-}
-
plugins_conf = configuration_data()
plugins_conf.set('libexecdir', gsd_libexecdir)
@@ -126,7 +121,6 @@ foreach plugin: all_plugins
unit_conf.set('description', plugin_description)
unit_conf.set('libexecdir', gsd_libexecdir)
unit_conf.set('plugin_dbus_name', plugin_dbus_name)
- unit_conf.set('plugin_restart', plugin_restart_rule.get(plugin_name, 'on-failure'))
gates_all = []
gates_after = []