diff --git a/Justfile b/Justfile index c7a5a4c89..93ec89fd9 100644 --- a/Justfile +++ b/Justfile @@ -36,11 +36,15 @@ check: test -f packages/utah.toml test -f packages/utah-packages.repo test -f system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset + test -f system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset test -f system_files/shared/usr/lib/systemd/system/bootc-unified-storage.service.d/10-utah-local-test.conf grep -q 'enable gdm.service' system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset grep -q 'enable ublue-system-setup.service' system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset grep -q 'disable bootc-fetch-apply-updates.timer' system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset grep -q 'disable bootc-fetch-apply-updates.service' system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset + grep -q 'enable pipewire.socket' system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset + grep -q 'enable pipewire-pulse.socket' system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset + grep -q 'enable wireplumber.service' system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset grep -q 'bootc-fetch-apply-updates.timer' scripts/configure-services.sh test -f scripts/configure-services.sh test -f scripts/configure-branding.sh diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md index 073a3c1fb..f234f9c91 100644 --- a/docs/skills/desktop-contract.md +++ b/docs/skills/desktop-contract.md @@ -57,7 +57,14 @@ The TOML's sections are the contract's table of contents: - **`[services]`** — systemd units the preset must enable: `gdm.service`, `bluetooth.service`, `ublue-system-setup.service`, `flatpak-preinstall.service`, `flatpak-nuke-fedora.service`, `brew-setup.service`, `dconf-update.service`, - `bootc-unified-storage.service`, `uupd.timer`. Update policy delegates + `bootc-unified-storage.service`, `uupd.timer`. User units are separate: + `user-preset/85-utah-desktop.preset` enables `pipewire.socket`, + `pipewire-pulse.socket`, and `wireplumber.service`, and + `scripts/configure-services.sh` enables the same three `--global`. + Socket activation is the Fedora default, so the `.service` units stay + triggered rather than enabled. Hummingbird's server user preset disables + everything unlisted, so without these the PipeWire socket never appears + and GNOME screencast fails. Update policy delegates background updates to `uupd.timer`; `bootc-fetch-apply-updates.timer` and `bootc-fetch-apply-updates.service` are masked in `/etc` and `/usr/lib` (and disabled in `85-utah-desktop.preset`) so cross-vendor `/etc` 3-way merges diff --git a/scripts/configure-services.sh b/scripts/configure-services.sh index 53f684b4e..35e9208bf 100644 --- a/scripts/configure-services.sh +++ b/scripts/configure-services.sh @@ -108,6 +108,15 @@ else fi # These are global user-service presets, so systemctl needs --global. +if user_unit_exists pipewire.socket; then + systemctl --global enable pipewire.socket +fi +if user_unit_exists pipewire-pulse.socket; then + systemctl --global enable pipewire-pulse.socket +fi +if user_unit_exists wireplumber.service; then + systemctl --global enable wireplumber.service +fi if user_unit_exists podman-auto-update.timer; then systemctl --global enable podman-auto-update.timer fi diff --git a/system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset b/system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset new file mode 100644 index 000000000..f9bc8e1b8 --- /dev/null +++ b/system_files/shared/usr/lib/systemd/user-preset/85-utah-desktop.preset @@ -0,0 +1,3 @@ +enable pipewire.socket +enable pipewire-pulse.socket +enable wireplumber.service