diff options
| author | Benjamin Berg <bberg@redhat.com> | 2021-01-20 16:32:41 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2021-01-20 16:52:45 +0100 |
| commit | 35b26f2d9c3662d83d686c4ea9a952796ef40c36 (patch) | |
| tree | 8df2b4f7720568018610ad7796dafc451ab357d7 | |
| parent | d97808f2b7900414f2c5c1f2a1f2544a0174b2f4 (diff) | |
| download | gnome-settings-daemon-benzea/xsettings-on-failure.tar.gz | |
plugins: Use Restart=on-failure even for XSettings pluginbenzea/xsettings-on-failure
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.
| -rw-r--r-- | plugins/gsd.service.in | 2 | ||||
| -rw-r--r-- | plugins/meson.build | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/plugins/gsd.service.in b/plugins/gsd.service.in index 79b5f553..c47a6768 100644 --- a/plugins/gsd.service.in +++ b/plugins/gsd.service.in @@ -18,7 +18,7 @@ Before=@plugin_dbus_name@.target Slice=session.slice Type=dbus ExecStart=@libexecdir@/gsd-@plugin_name@ -Restart=@plugin_restart@ +Restart=on-failure BusName=@plugin_dbus_name@ TimeoutStopSec=5 # We cannot use OnFailure as e.g. dependency failures are normal 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 = [] |