From 14ea4322feea0c649cf06feb503d3b8fd59522cd Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sat, 29 Jul 2023 10:37:26 +0200 Subject: Order the systemd services after graphical-session.target This fixes services in Wayland session where WAYLAND_DISPLAY is only imported into the systemd user instance environment after graphical-session.target is reached (such as GNOME). --- foot-server.service.in | 1 + foot-server.socket | 1 + 2 files changed, 2 insertions(+) diff --git a/foot-server.service.in b/foot-server.service.in index 47b81267..a9447253 100644 --- a/foot-server.service.in +++ b/foot-server.service.in @@ -8,6 +8,7 @@ Requires=%N.socket Description=Foot terminal server mode Documentation=man:foot(1) PartOf=graphical-session.target +After=graphical-session.target [Install] WantedBy=graphical-session.target diff --git a/foot-server.socket b/foot-server.socket index 997e4363..0c7c1b8f 100644 --- a/foot-server.socket +++ b/foot-server.socket @@ -3,6 +3,7 @@ ListenStream=%t/foot.sock [Unit] PartOf=graphical-session.target +After=graphical-session.target ConditionEnvironment=WAYLAND_DISPLAY [Install] -- cgit v1.3 From be4797d619d2b8081ba50685a6241be73265e30a Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sat, 29 Jul 2023 10:39:11 +0200 Subject: systemd: skip foot-server.service when not in a Wayland context --- foot-server.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/foot-server.service.in b/foot-server.service.in index a9447253..118b19ab 100644 --- a/foot-server.service.in +++ b/foot-server.service.in @@ -9,6 +9,7 @@ Description=Foot terminal server mode Documentation=man:foot(1) PartOf=graphical-session.target After=graphical-session.target +ConditionEnvironment=WAYLAND_DISPLAY [Install] WantedBy=graphical-session.target -- cgit v1.3 From f1075377d3f9e7073a15bb651e3dc2d1809bdba1 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sat, 29 Jul 2023 20:54:59 +0200 Subject: changelog: systemd units in GNOME --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c4682b9..f2272050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,8 +56,12 @@ * Minimum required version of _wayland-protocols_ is now 1.32 ([#1391][1391]). +* `foot-server.service` systemd now checks for + `ConditionEnvironment=WAYLAND_DISPLAY` for consistency with the + socket unit ([#1448][1448]) [1391]: https://codeberg.org/dnkl/foot/issues/1391 +[1448]: https://codeberg.org/dnkl/foot/pulls/1448 ### Deprecated @@ -67,6 +71,13 @@ ### Fixed + +* Race condition for systemd units start in GNOME and KDE + ([#1436][1436]). + +[1436]: https://codeberg.org/dnkl/foot/issues/1436 + + ### Security ### Contributors -- cgit v1.3