Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions baselines/triage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,12 @@ area = "printing"
issue = "#263"

[package.tuned]
status = "planned"
area = "hardware-power"
issue = "#263"
reason = "Published by the factory (#388) but uninstallable: Requires (rpm-ostree if bootc); bootc is in the image and rpm-ostree is waived and published nowhere (sha256:d3b5bac2)"
status = "waived"
reason = "Dakota, the parity target, ships power-profiles-daemon for power profiles; Utah installs it instead of TuneD"

[package.tuned-ppd]
status = "planned"
area = "hardware-power"
issue = "#263"
reason = "Published by the factory (#388) but uninstallable: Requires tuned (see tuned). Bluefin runs tuned-ppd instead of power-profiles-daemon, so the latter is not installed as a stand-in"
status = "waived"
reason = "Dakota, the parity target, ships power-profiles-daemon; tuned-ppd claims the same D-Bus name, so the two never ship together"

[package.smartmontools]
status = "planned"
Expand Down
18 changes: 14 additions & 4 deletions contracts/bluefin-desktop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,14 @@ enabled = [
"flatpak-nuke-fedora.service",
"flatpak-preinstall.service",
"gdm.service",
# GNOME's system services: gnome-build-meta's 80-gnome.preset, as Dakota
# ships it.
"colord.service",
"accounts-daemon.service",
"input-remapper.service",
"ModemManager.service",
"power-profiles-daemon.service",
"thermald.service",
"intel_lpmd.service",
"sysstat.service",
"sysstat-collect.timer",
"sysstat-summary.timer",
"projectbluefin-countme.timer",
"switcheroo-control.service",
"ublue-system-setup.service",
Expand All @@ -378,6 +379,9 @@ user_enabled = [
"pipewire-pulse.socket",
"wireplumber.service",
"xdg-user-dirs.service",
# Dakota parity: gnome-build-meta's user presets (80-speechd, 80-xdg).
"speech-dispatcher.socket",
"xdg-desktop-portal-rewrite-launchers.service",
]
masked = [
"bootc-fetch-apply-updates.service",
Expand Down Expand Up @@ -413,4 +417,10 @@ disabled = [
"httpd.socket",
"httpd@.service",
"htcacheclean.service",
# sysstat collection is opt-in, as in Dakota (elements/bluefin/sysstat.bst
# writes 80-sysstat.preset disabling all four); sar/iostat work on demand.
"sysstat.service",
"sysstat-collect.timer",
"sysstat-summary.timer",
"sysstat-rotate.timer",
]
12 changes: 6 additions & 6 deletions docs/skills/desktop-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ The TOML's sections are the contract's table of contents:
hook, and the system-flatpaks Brewfile whose app list the contract enumerates.
- **`[media]`** — GStreamer decoders that must load, not merely be installed: `openh264dec`.
The factory libav is built on `ffmpeg-free` (no H.264), so `avdec_h264` is not asserted (#1116).
- **`[services]`** — systemd units the preset must enable: `gdm.service`, `avahi-daemon.service`,
`avahi-daemon.socket`, `switcheroo-control.service`, `bluetooth.service`,
`ublue-system-setup.service`, `flatpak-preinstall.service`, `flatpak-nuke-fedora.service`,
`brew-setup.service`, `dconf-update.service`, `bootc-unified-storage.timer`,
`input-remapper.service`, `ModemManager.service`, `thermald.service`, `intel_lpmd.service`,
`sysstat.service`, `sysstat-collect.timer`, `sysstat-summary.timer`,
- **`[services]`** — systemd units the preset must enable: `gdm.service`, `colord.service`,
`accounts-daemon.service`, `avahi-daemon.service`, `avahi-daemon.socket`, `bluetooth.service`,
`switcheroo-control.service`, `ublue-system-setup.service`, `flatpak-preinstall.service`,
`flatpak-nuke-fedora.service`, `brew-setup.service`, `dconf-update.service`, `bootc-unified-storage.timer`,
`input-remapper.service`, `ModemManager.service`, `power-profiles-daemon.service`, `thermald.service`,
`projectbluefin-countme.timer`, `cups.socket`, `systemd-boot-update.service`, `uupd.timer`,
`bluefin-stats-refresh.timer`, `ublue-firstboot-date.service`, `ublue-booted-image.service`.
[Dakota service presets](desktop-contract/references/dakota-services.md): GNOME units, user units, opt-in sysstat.
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 (e.g. switching from Bluefin) do not
Expand Down
25 changes: 25 additions & 0 deletions docs/skills/desktop-contract/references/dakota-services.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Dakota service presets

Utah follows projectbluefin/dakota (`testing`) for these units. Each one is
wired in three places that must agree: `85-utah-desktop.preset` (system or
user), `scripts/configure-services.sh`, and `contracts/bluefin-desktop.toml`
`[services]`.

- `colord.service` and `accounts-daemon.service` are enabled. Dakota inherits
them from gnome-build-meta's `files/systemd-presets/system-preset/80-gnome.preset`.
They are in `[services].enabled`.
- `speech-dispatcher.socket` and `xdg-desktop-portal-rewrite-launchers.service`
are globally enabled user units, from gnome-build-meta's
`user-preset/80-speechd.preset` and `80-xdg.preset`. They are in the
`configure-services.sh` user loop (guarded by `user_unit_exists`) and in
`[services].user_enabled`.
- sysstat collection is opt-in. Dakota's `elements/bluefin/sysstat.bst`
presets `sysstat.service`, `sysstat-collect.timer`, `sysstat-summary.timer`
and `sysstat-rotate.timer` off; Utah's preset disables all four,
`configure-services.sh` runs `disable_unit` on them, and the contract's
`disabled` list holds them off. The package still ships, so `sar` and
`iostat` work on demand; enable collection with
`systemctl enable --now sysstat.service`.

`ServiceMaskParityTests` in `tests/test_desktop_contract.py` pins the
three-way agreement for each group.
25 changes: 16 additions & 9 deletions docs/skills/package-contract/references/factory-consumption.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,28 @@ Rules applied while choosing names:
to read whether a unit is enabled. It enables `thermald.service`,
`intel_lpmd.service`, `tuned.service`, `tuned-ppd.service`, `smartd.service`,
`nfs-client.target`, `sysstat.service` and its two timers, but not
`rpcbind`, `autofs`, `brltty`, `dnsmasq`, `saned` or `ipp-usb`. Utah wires
`sysstat*` and disables `nfs-client.target` (Hummingbird's own preset enables
`rpcbind`, `autofs`, `brltty`, `dnsmasq`, `saned` or `ipp-usb`. Utah follows
Dakota rather than Fedora on `sysstat*`: collection is opt-in
(`elements/bluefin/sysstat.bst` disables `sysstat.service` and its three
timers), so the preset disables them and the contract's `disabled` list holds
them off. Utah also disables `nfs-client.target` (Hummingbird's own preset enables
it): it pulls in `gssproxy.service`, which failed to start in the review VM
(`STATE_DIRECTORY`, Permission denied; cause not diagnosed). `tuned` (Requires `rpm-ostree if bootc`,
and rpm-ostree is waived and unpublished) and `smartmontools` are not
installable, so their units stay unwired. Bluefin ships `tuned-ppd` rather
than `power-profiles-daemon`; never install both.
(`STATE_DIRECTORY`, Permission denied; cause not diagnosed).
`smartmontools` is not installable, so its unit stays unwired.
- Power profiles follow Dakota, not Bluefin: Utah installs and enables
`power-profiles-daemon` and ships no TuneD. Never install `tuned-ppd`
beside it: both claim `org.freedesktop.UPower.PowerProfiles`. TuneD also
called `bootc loader-entries` on every profile switch and hung on the
ostree sysroot lock, which needed a post-loaded profile workaround; PPD has
no bootloader plugin, so that workaround is gone.
- A `planned` triage entry for a name Utah now installs closes when
`just baselines` refreshes the Utah snapshot; do not hand-edit the generated
snapshot.

Installed is not working. Package presence says nothing about whether a daemon
starts or does its job: thermald and intel_lpmd stand down on unsupported CPUs,
and tuned-ppd's power-profiles API is only observable from GNOME Settings on
hardware.
starts or does its job: thermald stands down on unsupported CPUs, and
power-profiles-daemon's API is only observable from GNOME Settings (or
`powerprofilesctl`) on hardware.

## Closing baseline gaps

Expand Down
26 changes: 12 additions & 14 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,13 @@ packages = [
# in Bluefin's [excluded] list. Each name was resolved against the pinned
# image by CI's package availability step.
#
# Power and thermal policy (#388). Fedora's preset (redhat-systemd-presets
# 90-default.preset, which Bluefin inherits) enables thermald and
# intel_lpmd; the matching enablements are in 85-utah-desktop.preset and
# Power and thermal policy (#388), as Dakota ships it: power-profiles-daemon
# (gnome-build-meta core-deps) backs GNOME's power-profile switch, and
# thermald handles thermal limits. Dakota ships neither TuneD/tuned-ppd nor
# intel-lpmd. The matching enablements are in 85-utah-desktop.preset and
# configure-services.sh.
"power-profiles-daemon",
"thermald",
"intel-lpmd",
"powerstat",
# Everyday command-line tools (#392). xdg-utils supplies xdg-open, which
# nothing else in the image provides. nano-default-editor sets EDITOR.
Expand Down Expand Up @@ -465,9 +466,9 @@ packages = [
# (libutempter, libhandy, gssproxy, quota, python3-pillow, python3-cups,
# usbutils, net-snmp, libtraceevent/libtracefs, libsrtp, gtksourceview5,
# djvulibre, liba52, libmpeg2) are published, so the names they gated resolve.
# sysstat's units are the ones Fedora's preset enables and Utah wires
# (85-utah-desktop.preset, configure-services.sh, desktop contract);
# nfs-client.target is disabled, see 85-utah-desktop.preset.
# sysstat ships for on-demand sar/iostat; its collection units are opt-in
# and preset-disabled, as in Dakota (elements/bluefin/sysstat.bst; see
# 85-utah-desktop.preset). nfs-client.target is disabled there too.
"tmux",
"powertop",
"sysstat",
Expand Down Expand Up @@ -502,12 +503,9 @@ packages = [
"papers-nautilus",
#
# Left out (resolved against sha256:d3b5bac2):
# tuned, tuned-ppd (#388) Requires (rpm-ostree if bootc). bootc is in
# the image, rpm-ostree is waived (Utah updates
# with bootc) and published nowhere. Bluefin
# runs tuned-ppd instead of
# power-profiles-daemon, so the latter is not
# installed as a stand-in.
# tuned, tuned-ppd Dakota runs power-profiles-daemon, which is
# installed above; the two claim the same
# D-Bus name, so never install both.
# gstreamer1-plugins-good-qt Qt5 (libQt5Qml, libQt5Quick,
# libQt5WaylandClient, libQt5X11Extras);
# Bluefin also ships the -qt6 split, which is
Expand Down Expand Up @@ -886,8 +884,8 @@ parity = [
"gstreamer1-plugin-openh264",
"openh264",
# Bluefin tools consumed from the pinned factory (#263, #388, #392).
"power-profiles-daemon",
"thermald",
"intel-lpmd",
"powerstat",
"xdg-utils",
"rsync",
Expand Down
35 changes: 17 additions & 18 deletions scripts/configure-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ enable_unit flatpak-preinstall.service
# bluez installed. Enable it next to the other desktop units; see #98.
enable_unit gdm.service
enable_unit bluetooth.service
# GNOME's system services, from gnome-build-meta's 80-gnome.preset as Dakota
# ships it (files/systemd-presets/system-preset/80-gnome.preset).
enable_unit colord.service
enable_unit accounts-daemon.service
# Bluefin defaults for mDNS discovery and hybrid-GPU application launching.
enable_unit avahi-daemon.service
enable_unit avahi-daemon.socket
Expand Down Expand Up @@ -176,15 +180,18 @@ fi
# root credentials on launch. Enable it next to the desktop units; see #99.
enable_unit input-remapper.service
enable_unit ModemManager.service
# Thermal management, as Fedora's preset enables it for Bluefin (#388).
# Power profiles and thermal management as Dakota ships them (#388):
# power-profiles-daemon, not TuneD, and no intel_lpmd.
enable_unit power-profiles-daemon.service
enable_unit thermald.service
enable_unit intel_lpmd.service
# sysstat accounting, as Fedora's preset enables it for Bluefin (#263).
# nfs-client.target is turned off: see 85-utah-desktop.preset.
disable_unit nfs-client.target
enable_unit sysstat.service
enable_unit sysstat-collect.timer
enable_unit sysstat-summary.timer
# sysstat collection is opt-in, as in Dakota (elements/bluefin/sysstat.bst);
# the package stays for on-demand sar/iostat. See 85-utah-desktop.preset.
disable_unit sysstat.service
disable_unit sysstat-collect.timer
disable_unit sysstat-summary.timer
disable_unit sysstat-rotate.timer
# Printing on demand, as Fedora's preset enables it for Bluefin; Hummingbird's
# 99-default-disable would leave it off.
enable_unit cups.socket
Expand Down Expand Up @@ -222,17 +229,6 @@ grep -qx 'DeployCollectionID=org.flathub.Stable' /etc/flatpak/remotes.d/flathub.

disable_unit flatpak-add-fedora-repos.service

# Keep TuneD off the ostree sysroot lock: its bootloader plugin would run
# `bootc loader-entries set-options-for-source` on every power-profile switch
# and hang behind bootc-unified-storage or an upgrade. The profile explains;
# TuneD merges a post-loaded profile into every profile it applies, including
# the ones tuned-ppd switches to. Written here, after the package transaction,
# because the tuned RPM owns this %config(noreplace) file.
if rpm -q --quiet tuned; then
test -f /usr/lib/tuned/profiles/utah-bootc-kargs-off/tuned.conf
printf '%s\n' utah-bootc-kargs-off > /etc/tuned/post_loaded_profile
fi

# Keep image updates under uupd/bootc rather than the legacy rpm-ostree path.
# Mask in /usr/lib as well as /etc so the mask survives cross-vendor /etc 3-way merges
# when switching from systems that have bootc-fetch-apply-updates enabled (such as Bluefin).
Expand Down Expand Up @@ -288,9 +284,12 @@ fi
# asserts the result (services.user_enabled).
# grub-boot-success.timer is deliberately absent: /boot is read-only at runtime
# so the mark can never be written (see the user preset, #364).
# speech-dispatcher.socket and xdg-desktop-portal-rewrite-launchers.service
# follow Dakota, which inherits them from gnome-build-meta's user presets.
for unit in pipewire.socket pipewire-pulse.socket wireplumber.service \
xdg-user-dirs.service \
obex.service mpris-proxy.service; do
obex.service mpris-proxy.service \
speech-dispatcher.socket xdg-desktop-portal-rewrite-launchers.service; do
if user_unit_exists "${unit}"; then
systemctl --global enable "${unit}"
else
Expand Down
4 changes: 2 additions & 2 deletions site/data/packages.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"generated_at": "2026-10-28",
"generated_at": "2026-11-14",
"generator": "scripts/generate-site-data.py",
"groups": [
{
Expand Down Expand Up @@ -200,7 +200,6 @@
"htop",
"ibus-gtk4",
"intel-gmmlib",
"intel-lpmd",
"intel-mediasdk",
"intel-vpl-gpu-rt",
"ipp-usb",
Expand Down Expand Up @@ -260,6 +259,7 @@
"plymouth-system-theme",
"plymouth-theme-spinner",
"poppler-utils",
"power-profiles-daemon",
"powerstat",
"powertop",
"printer-driver-brlaser",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# Keep these in /usr/lib so bootc's first-boot preset application sees them.
enable gdm.service
enable bluetooth.service
# GNOME's system services, as Dakota inherits them from gnome-build-meta's
# files/systemd-presets/system-preset/80-gnome.preset: colour management and
# the AccountsService daemon Settings and GDM use to manage users.
enable colord.service
enable accounts-daemon.service
# Match Bluefin discovery and hybrid-GPU defaults.
enable avahi-daemon.service
enable avahi-daemon.socket
Expand Down Expand Up @@ -36,15 +41,21 @@ enable flatpak-preinstall.service
enable flatpak-nuke-fedora.service
enable input-remapper.service
enable ModemManager.service
# Laptop thermal management (#388). Fedora's 90-default.preset enables both for
# desktops; Hummingbird's 99-default-disable would leave them off.
# Power profiles and thermal management as Dakota ships them (#388):
# power-profiles-daemon backs GNOME's power-mode switch and thermald handles
# thermal limits. Utah ships neither TuneD/tuned-ppd nor intel_lpmd.
# Hummingbird's 99-default-disable would leave both off.
enable power-profiles-daemon.service
enable thermald.service
enable intel_lpmd.service
# System activity accounting, enabled by Fedora's 90-default.preset for Bluefin
# (#263).
enable sysstat.service
enable sysstat-collect.timer
enable sysstat-summary.timer
# System activity accounting is opt-in, as in Dakota
# (elements/bluefin/sysstat.bst writes 80-sysstat.preset disabling all four):
# sar/iostat/mpstat/pidstat work on demand without the collectors. Enable with
# `systemctl enable --now sysstat.service`. Listed explicitly, as Dakota does,
# rather than left to Hummingbird's 99-default-disable.
disable sysstat.service
disable sysstat-collect.timer
disable sysstat-summary.timer
disable sysstat-rotate.timer
# nfs-client.target is enabled by both Fedora's and Hummingbird's 90-default
# preset, and is turned off here on purpose. Installing nfs-common-utils (#263)
# made it start gssproxy.service (target -> auth-rpcgss-module.service ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ enable wireplumber.service
enable xdg-user-dirs.service
enable obex.service
enable mpris-proxy.service
# Dakota inherits these from gnome-build-meta's user presets
# (files/systemd-presets/user-preset/80-speechd.preset and 80-xdg.preset):
# socket-activated speech for screen readers, and renaming dynamic-launcher
# autostart entries when an app is renamed.
enable speech-dispatcher.socket
enable xdg-desktop-portal-rewrite-launchers.service

# Common installs the ChairLift GUI on login; enable globally at build time too.
enable brew-preinstall.service
3 changes: 0 additions & 3 deletions system_files/shared/usr/lib/tmpfiles.d/utah-tuned.conf

This file was deleted.

This file was deleted.

Loading
Loading