[gnome-shell] Clarify comments on ConditionEnvironment placement
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Clarify comments on ConditionEnvironment placement
- Date: Wed, 9 Dec 2020 15:13:01 +0000 (UTC)
commit d263f5731c094c412446cc671d511279d6b010ad
Author: Hans Ulrich Niedermann <hun n-dimensional de>
Date: Sun Oct 18 19:55:13 2020 +0200
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>
data/org gnome Shell wayland service in | 6 +++---
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 12f7fbaa79..38887eb193 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 f2ff0ce34a..7310f66081 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]