Files
VallierDevandClaude Opus 5.5 9125e51350 Review fixes: tolerate a vanished default sink, recover stale virtual displays
- virtual_audio: when the previous default output no longer exists, still
  unload the null sink instead of keeping all output on it.
- uu-virtual-desktop: a socket/lock left by a dead Xvfb no longer blocks the
  service forever (Restart=always loop); a live owner is still refused.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-15 11:03:42 +08:00

90 lines
4.3 KiB
Bash
Executable File

#!/bin/sh
# Virtual desktop for a monitorless Linux host: Xvfb + a desktop session on the user bus (or an isolated private bus).
# uuremote-server then serves it with DISPLAY=$UU_VIRTUAL_DISPLAY (see README in this folder).
# UU_VIRTUAL_DISPLAY X display number (default :99)
# UU_VIRTUAL_SIZE screen size (default 1920x1080)
# UU_VIRTUAL_SESSION session command (default: first of startxfce4, mate-session, startlxqt, openbox-session, xterm)
# UU_VIRTUAL_BUS user (default): the systemd user bus (`loginctl enable-linger`) gets DISPLAY, so
# D-Bus/systemd-activated apps (GNOME terminal, portals, ...) open on the virtual screen;
# private: own dbus-run-session bus, for machines that also run a real desktop session
set -eu
display="${UU_VIRTUAL_DISPLAY:-:99}"
size="${UU_VIRTUAL_SIZE:-1920x1080}"
session="${UU_VIRTUAL_SESSION:-}"
if [ -z "$session" ]; then
for candidate in startxfce4 mate-session startlxqt openbox-session xterm; do
if command -v "$candidate" >/dev/null 2>&1; then session="$candidate"; break; fi
done
fi
[ -n "$session" ] || { echo "no desktop session found; set UU_VIRTUAL_SESSION" >&2; exit 1; }
command -v Xvfb >/dev/null || { echo "Xvfb not installed (apt install xvfb)" >&2; exit 1; }
bus="${UU_VIRTUAL_BUS:-user}"
case "$bus" in user|private) ;; *) echo "UU_VIRTUAL_BUS must be user or private" >&2; exit 1 ;; esac
command -v xauth >/dev/null || { echo "xauth not installed" >&2; exit 1; }
command -v xdpyinfo >/dev/null || { echo "xdpyinfo not installed" >&2; exit 1; }
case "$display" in :[0-9]*) ;; *) echo "UU_VIRTUAL_DISPLAY must be a local display number" >&2; exit 1 ;; esac
number="${display#:}"
case "$number" in *[!0-9]*|'') echo "invalid display number" >&2; exit 1 ;; esac
socket="/tmp/.X11-unix/X$number"
# A live server owns the display; a dead one's leftovers (killed Xvfb) are cleaned up by Xvfb itself.
lock="/tmp/.X$number-lock"
if [ -e "$socket" ] || [ -e "$lock" ]; then
owner=$(tr -d ' \n' < "$lock" 2>/dev/null || :)
case "$owner" in ''|*[!0-9]*) owner= ;; esac
if [ -z "$owner" ] || kill -0 "$owner" 2>/dev/null; then echo "display already in use" >&2; exit 1; fi
echo "removing stale display $display left by dead process $owner" >&2
rm -f "$lock" "$socket" 2>/dev/null || { echo "cannot remove stale display files" >&2; exit 1; }
fi
umask 077
export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
authority="$XDG_RUNTIME_DIR/uu-virtual-$number.Xauthority"
# The display socket was checked above; replace a stale authority after a service crash.
[ ! -L "$authority" ] || { echo "refusing a symlink authority" >&2; exit 1; }
temporary=$(mktemp "$XDG_RUNTIME_DIR/uu-virtual-xauth.XXXXXX")
xvfb=
child=
cleanup() {
trap - EXIT INT TERM
[ -z "$child" ] || kill "$child" 2>/dev/null || :
[ -z "$xvfb" ] || kill "$xvfb" 2>/dev/null || :
[ -z "$xvfb" ] || wait "$xvfb" 2>/dev/null || :
rm -f "$authority" "$temporary"
}
trap cleanup EXIT
trap 'exit 143' TERM
trap 'exit 130' INT
cookie=$(od -An -N16 -tx1 /dev/urandom | tr -d ' \n')
xauth -f "$temporary" add "$display" MIT-MAGIC-COOKIE-1 "$cookie"
unset cookie
mv "$temporary" "$authority"
export XAUTHORITY="$authority"
Xvfb "$display" -screen 0 "${size}x24" -auth "$authority" -nolisten tcp -noreset &
xvfb=$!
export DISPLAY="$display"
unset WAYLAND_DISPLAY SESSION_MANAGER
export XDG_SESSION_TYPE=x11
ready=false
for _ in $(seq 50); do
kill -0 "$xvfb" 2>/dev/null || break
if xdpyinfo >/dev/null 2>&1; then ready=true; break; fi
sleep 0.1
done
[ "$ready" = true ] || { echo "Xvfb did not become ready" >&2; exit 1; }
if [ "$bus" = user ]; then
# Linger creates the user manager and its bus without a graphical login.
: "${XDG_RUNTIME_DIR:=/run/user/$(id -u)}"
export XDG_RUNTIME_DIR
export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
[ -S "$XDG_RUNTIME_DIR/bus" ] || { echo "user bus unavailable; enable loginctl enable-linger" >&2; exit 1; }
systemctl --user unset-environment WAYLAND_DISPLAY
dbus-update-activation-environment --systemd DISPLAY XAUTHORITY XDG_SESSION_TYPE
# Keep the supervising shell alive: exec would discard the Xvfb cleanup trap.
sh -c "$session" &
else
dbus-run-session -- sh -c "$session" &
fi
child=$!
if [ -n "${NOTIFY_SOCKET:-}" ]; then systemd-notify --ready; fi
wait "$child"