diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-10-18 19:55:13 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2020-12-09 15:08:15 +0000 |
| commit | d263f5731c094c412446cc671d511279d6b010ad (patch) | |
| tree | 1518ececa599352acf274e6d6888bc140d89b482 | |
| parent | 38d642541cff665bc3c565198dcb7c3c8e3facdf (diff) | |
| download | gnome-shell-d263f5731c094c412446cc671d511279d6b010ad.tar.gz | |
Clarify comments on ConditionEnvironment placement
Clarify the comments on ConditionEnvironment= by mentioning that a
ConditionEnvironment= line must be located in the [Unit] section.
The comments suggesting using ConditionEnvironment= themselves are
in the [Service] section, which implicitly and wrongly suggests
that ConditionEnvironment= could be defined right there as well.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472>
| -rw-r--r-- | data/org.gnome.Shell@wayland.service.in | 6 | ||||
| -rw-r--r-- | data/org.gnome.Shell@x11.service.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in index 12f7fbaa7..38887eb19 100644 --- a/data/org.gnome.Shell@wayland.service.in +++ b/data/org.gnome.Shell@wayland.service.in @@ -16,9 +16,9 @@ Before=gnome-session-initialized.target [Service] Slice=session.slice Type=notify -# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 246. Also, the current solution is kind of painful -# as systemd had a bug where it retries the condition. +# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in +# the [Unit] section with systemd >= 246. Also, the current solution is +# kind of painful as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecStart=@bindir@/gnome-shell diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in index f2ff0ce34..7310f6608 100644 --- a/data/org.gnome.Shell@x11.service.in +++ b/data/org.gnome.Shell@x11.service.in @@ -20,9 +20,9 @@ StartLimitBurst=3 [Service] Slice=session.slice Type=notify -# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 246. Also, the current solution is kind of painful -# as systemd had a bug where it retries the condition. +# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in +# the [Unit] section with systemd >= 246. Also, the current solution is +# kind of painful as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecStart=@bindir@/gnome-shell |