[PATCH] host/rootfs: delay Weston until udevadm settle

[PATCH] host/rootfs: delay Weston until udevadm settle

[Alyssa Ross]

We might not get a card0; rather a card1.  There's no easy way to wait
for multiple devices with udev, so instead we just wait for all boot
events to have been processed.  Later, we will get COSMIC to allow
being started with no cards available.  For now, this is fine.

(If somebody boots with no GPU, and then hotplugs one, we allow Weston
to restart in a loop until that happens.  That should be pretty uncommon.)

Closes: https://matrix.to/#/!xSysqhzbOZImdvGpix:fairydust.space/$FXt0B6ZcIn1KO1k-sis5WrESsePTmi1hfg4ZXiVXwTM?via=fairydust.space&via=matrix.org&via=dataaturservice.se
Link: https://matrix.to/#/!xSysqhzbOZImdvGpix:fairydust.space/$Gvq6jxvt5d5qngIqs0xssBmONLH-q66g-HG_9E7TOWw?via=fairydust.space&via=matrix.org&via=dataaturservice.se
Reported-by: Yureka Lilian <yureka@cyberchaos.dev>
Closes: https://inbox.spectrum-os.org/spectrum-devel/6ba1fc13-c905-4074-a878-bb2488ef2020@gmail.com
Link: https://inbox.spectrum-os.org/spectrum-devel/20260524-weston-card-fix-v1-1-9c6dad59c245@gmail.com
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Fixes: 372bacd ("etc/s6-rc: add weston service")
---
 host/rootfs/image/etc/s6-rc/weston/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/host/rootfs/image/etc/s6-rc/weston/run b/host/rootfs/image/etc/s6-rc/weston/run
index fd59586..8b065ee 100644
--- a/host/rootfs/image/etc/s6-rc/weston/run
+++ b/host/rootfs/image/etc/s6-rc/weston/run
@@ -40,7 +40,7 @@ redirfd -r 0 /dev/tty1
 
 importas -i home HOME
 cd $home
-if { udevadm wait /dev/dri/card0 }
+if { udevadm settle }
 s6-setuidgid wayland
 bwrap
   # no --unshare-net, breaks udev hotplug

base-commit: 1e746f2b283f0d4964131e80b6a4f1def99f7510
-- 
2.54.0