[gnome-shell] Correct the systemd version required for ConditionEnvironment=
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Correct the systemd version required for ConditionEnvironment=
- Date: Wed, 9 Dec 2020 15:13:01 +0000 (UTC)
commit 38d642541cff665bc3c565198dcb7c3c8e3facdf
Author: Hans Ulrich Niedermann <hun n-dimensional de>
Date: Fri Oct 23 10:42:38 2020 +0200
Correct the systemd version required for ConditionEnvironment=
According to systemd's NEWS file, the ConditionEnvironment= setting
has only been introduced in systemd 246, not in 245 like the comment
in the services files claimed.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472#note_942075
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472>
data/org gnome Shell wayland service in | 2 +-
data/org gnome Shell x11 service in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/org gnome Shell wayland service in b/data/org gnome Shell wayland service in
index 692d45bb37..12f7fbaa79 100644
--- a/data/org gnome Shell wayland service in
+++ b/data/org gnome Shell wayland service in
@@ -17,7 +17,7 @@ Before=gnome-session-initialized.target
Slice=session.slice
Type=notify
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-# with systemd >= 245. Also, the current solution is kind of painful
+# 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'
diff --git a/data/org gnome Shell x11 service in b/data/org gnome Shell x11 service in
index a70f249095..f2ff0ce34a 100644
--- a/data/org gnome Shell x11 service in
+++ b/data/org gnome Shell x11 service in
@@ -21,7 +21,7 @@ StartLimitBurst=3
Slice=session.slice
Type=notify
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-# with systemd >= 245. Also, the current solution is kind of painful
+# 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'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]