[gnome-settings-daemon/benzea/systemd-3-36: 17/25] meson: Rename plugin_install_wants to plugin_gate_units
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/benzea/systemd-3-36: 17/25] meson: Rename plugin_install_wants to plugin_gate_units
- Date: Fri, 31 Jul 2020 08:53:14 +0000 (UTC)
commit f1a088100487c455145d5768109cad30ea694955
Author: Benjamin Berg <bberg redhat com>
Date: Thu Dec 12 13:02:49 2019 +0100
meson: Rename plugin_install_wants to plugin_gate_units
The idea is to generate a gsd-X-gate.target intermediate unit which
has a requisite on all units listed in plugin_gate_units.
i.e. for most services we are going to have:
* gsd-X.target: marker on whether services should run in the session
* gsd-X.service: actual service that is started
This changes for units that should only run under certain conditions
(e.g. X11 or smartcard). In that case we add
+ gsd-X-gate.target
which has a proper requisite on all required units and ensures that the
servie will only start if all dependencies are met. This gate unit is
primarily needed so that we can still have an OnFailure target in the
.service file without issues.
plugins/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/meson.build b/plugins/meson.build
index 050ee730..885d3ffa 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -40,8 +40,8 @@ if not enable_wwan
disabled_plugins += ['wwan']
endif
-plugin_install_wants = {
- 'xsettings': ['gnome-session-x11-services.target.wants/'],
+plugin_gate_units = {
+ 'xsettings': ['gnome-session-x11-services.target'],
# 'dummy': ['required-started.target.wants/'],
# 'wacom': ['wacom.target.wants/'],
# 'smartcard': ['smartcard.target.wants/'],
@@ -120,8 +120,8 @@ foreach plugin: all_plugins
install_dir: systemd_userunitdir
)
- if plugin_name in plugin_install_wants
- foreach target: plugin_install_wants[plugin_name]
+ if plugin_name in plugin_gate_units
+ foreach target: plugin_gate_units[plugin_name]
meson.add_install_script('meson-add-wants.sh', systemd_userunitdir, target, user_target)
endforeach
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]