aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-08-11 14:41:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-08-11 14:41:11 +0000
commit95bce2b20c16367d28c48ecd80f33b15fed3c10a (patch)
treeddc21c763f353975ae8c095270b9abef954343c7
parentmeson: allow building with wayland-protocols as a subproject (diff)
parentchangelog: systemd units in GNOME (diff)
Merge branch 'systemd-service-ordering'
Closes #1436
-rw-r--r--CHANGELOG.md11
-rw-r--r--foot-server.service.in2
-rw-r--r--foot-server.socket1
3 files changed, 14 insertions, 0 deletions
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
diff --git a/foot-server.service.in b/foot-server.service.in
index 47b81267..118b19ab 100644
--- a/foot-server.service.in
+++ b/foot-server.service.in
@@ -8,6 +8,8 @@ Requires=%N.socket
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
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]