Fix kiosk mode

2026-06-17 13:20:52 +00:00
parent fd84ba4180
commit 4b0e0135b3
5 changed files with 111 additions and 55 deletions
@@ -1,22 +1,49 @@
 #!/bin/bash
-# kiosk-session — launched by cage (Wayland) from kiosk.service.
-# Starts Chromium fullscreen on the configured URL.
+# kiosk-session — main process of kiosk.service.
 #
-# KIOSK_URL comes from /etc/kiosk/kiosk.env (baked from the kiosk_url Packer
-# var; a runtime config-agent could override it later). The Chromium profile is
-# pinned to a tmpfs path so writes land in RAM (the root is read-only erofs +
-# volatile overlay) — watch RAM if the page is heavy.
+# Launches the weston compositor in the FOREGROUND (so it owns the logind seat
+# session systemd set up via PAMName=login) and, once weston's Wayland socket is
+# up, runs Chromium fullscreen in the BACKGROUND with a crash-restart loop.
 #
-# VM/GPU notes: --disable-gpu + the pixman wlroots renderer (WLR_RENDERER in
-# kiosk.env) keep this working on VMs with no real GPU. On hardware with a GPU,
-# drop --disable-gpu (and set WLR_RENDERER=gles2) for compositing.
-set -euo pipefail
+# Why a wrapper instead of weston.ini [autolaunch]: EPEL 9 ships weston 8.0,
+# which has neither kiosk-shell.so nor [autolaunch] (both weston 9.0). So weston
+# runs desktop-shell.so (see weston.ini) and we start Chromium here.
+#
+# Process model: systemd -> this script -> exec weston. The Chromium loop is
+# forked before the exec, so it lives in the unit's cgroup; when weston exits the
+# service is torn down (KillMode=control-group) and the loop dies with it. If
+# Chromium alone crashes, the loop relaunches it without taking weston down.
+#
+# KIOSK_URL comes from /etc/kiosk/kiosk.env. The Chromium profile/cache live on
+# tmpfs (root is read-only erofs + volatile overlay) — writes land in RAM; watch
+# RAM if the page is heavy (it can starve the NVMe-oF keep-alive — see TODO).
+set -uo pipefail

-BROWSER=$(command -v chromium-browser || command -v chromium)
+: "${KIOSK_URL:?KIOSK_URL not set in /etc/kiosk/kiosk.env}"
+export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
+SOCK=wayland-kiosk

-exec "$BROWSER" \
-    --kiosk --noerrdialogs --disable-infobars --incognito --no-first-run \
-    --disable-session-crashed-bubble --start-maximized \
-    --ozone-platform=wayland --disable-gpu \
-    --user-data-dir=/tmp/kiosk-profile --disk-cache-dir=/tmp/kiosk-cache \
-    "${KIOSK_URL:?KIOSK_URL not set in /etc/kiosk/kiosk.env}"
+BROWSER=$(command -v chromium-browser || command -v chromium || true)
+: "${BROWSER:?chromium not found (expected chromium-browser or chromium in PATH)}"
+
+# Background: wait (up to ~60s) for weston's socket, then keep Chromium running.
+(
+    for _ in $(seq 1 120); do
+        [ -S "$XDG_RUNTIME_DIR/$SOCK" ] && break
+        sleep 0.5
+    done
+    export WAYLAND_DISPLAY="$SOCK"
+    while :; do
+        "$BROWSER" \
+            --kiosk --noerrdialogs --disable-infobars --incognito --no-first-run \
+            --disable-session-crashed-bubble --start-maximized \
+            --ozone-platform=wayland --disable-gpu \
+            --user-data-dir=/tmp/kiosk-profile --disk-cache-dir=/tmp/kiosk-cache \
+            "$KIOSK_URL" || true
+        sleep 2
+    done
+) &
+
+# weston as the foreground process (owns the seat; service restarts if it dies).
+# desktop-shell + explicit socket; --use-pixman = software rendering for VMs.
+exec weston --use-pixman --socket="$SOCK" --config=/etc/xdg/weston/weston.ini