From b4562648460ccedffb5c89d0c68be9705ff2a0b6 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Fri, 28 Mar 2025 14:28:54 +0100 Subject: [PATCH] fix: wlr-services might not have started services when they are disabled This can happen when the compositor exits, the services aren't stopped in time, and they crash because they can't connect to wayland display. This will make sure they get re-enabled on start of wlr-services. This shouldn't be dangerous, because wlr-services is started just once, and at worst if it was failing, it would get restarted 5 times and then disabled, leading to maximum of 5*5*(count of wlr-services) restarts, which is quite a lot, but not infinity :) Anyway wlr-services shouldn't be crashing when configured properly (what if service doesn't exist...?) so this shouldn't ever happen. --- modules/ruther/home/services/wayland.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/ruther/home/services/wayland.scm b/modules/ruther/home/services/wayland.scm index cdda994..1320807 100644 --- a/modules/ruther/home/services/wayland.scm +++ b/modules/ruther/home/services/wayland.scm @@ -143,6 +143,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (if (service-running? display-service) (for-each (lambda (service) + ;; Services might be disabled after wayland has been stopped + ;; abruptly + (enable-service (lookup-service service)) (start-service (lookup-service service))) '#$services) (begin @@ -159,7 +162,8 @@ This should be called from a wayland compositor like this: `herd start wayland-d '#$services) (when (equal? stop-display "yes") - ((@ (shepherd support) local-output) ((@ (shepherd support) l10n) "Stopping wayland-display as well.")) + ((@ (shepherd support) local-output) ((@ (shepherd support) l10n) "Stopping wayland-display and x-display as well.")) + (stop-service (lookup-service 'x-display)) (stop-service (lookup-service 'wayland-display))) #f))))) -- 2.48.1