[gnome-settings-daemon/benzea/xsettings-on-failure: 2/2] plugins: Use Restart=on-failure even for XSettings plugin

[Benjamin Berg <bberg src gnome org>]

commit 20e7524f3deb17cd4046a9819523e84dfe372807
Author: Benjamin Berg <bberg redhat com>
Date:   Wed Jan 20 16:32:41 2021 +0100

    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.

 plugins/gsd.service.in | 2 +-
 plugins/meson.build    | 6 ------
 2 files changed, 1 insertion(+), 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 = []