brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify comments on ConditionEnvironment placement

Browse Source 
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>
This commit is contained in:
Hans Ulrich Niedermann 2020-10-18 19:55:13 +02:00 committed by Marge Bot
parent 38d642541c
commit d263f5731c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/org.gnome.Shell@wayland.service.in
View File

@ -16,9 +16,9 @@ Before=gnome-session-initialized.target
[Service] [Service]
Slice=session.slice Slice=session.slice
Type=notify Type=notify
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
# with systemd >= 246. Also, the current solution is kind of painful # the [Unit] section with systemd >= 246. Also, the current solution is
# as systemd had a bug where it retries the condition. # kind of painful as systemd had a bug where it retries the condition.
# Only start if the template instance matches the session type. # Only start if the template instance matches the session type.
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
ExecStart=@bindir@/gnome-shell ExecStart=@bindir@/gnome-shell

6
data/org.gnome.Shell@x11.service.in
View File

@ -20,9 +20,9 @@ StartLimitBurst=3
[Service] [Service]
Slice=session.slice Slice=session.slice
Type=notify Type=notify
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
# with systemd >= 246. Also, the current solution is kind of painful # the [Unit] section with systemd >= 246. Also, the current solution is
# as systemd had a bug where it retries the condition. # kind of painful as systemd had a bug where it retries the condition.
# Only start if the template instance matches the session type. # Only start if the template instance matches the session type.
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
ExecStart=@bindir@/gnome-shell ExecStart=@bindir@/gnome-shell