Skip to content
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ than being noticed later.
| | count |
| --- | --- |
| Bluefin contract installed | **61** |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 90 |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 91 |
| Genuinely unavailable | **7** |

The install writes its resolved list to `/usr/share/utah/contract.txt` and the
Expand Down
3 changes: 3 additions & 0 deletions contracts/bluefin-desktop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ apps = [

[services]
enabled = [
"avahi-daemon.service",
"avahi-daemon.socket",
"bluetooth.service",
"bootc-unified-storage.service",
"brew-setup.service",
Expand All @@ -157,6 +159,7 @@ enabled = [
"gdm.service",
"input-remapper.service",
"ModemManager.service",
"switcheroo-control.service",
"ublue-system-setup.service",
"uupd.timer",
"systemd-boot-update.service",
Expand Down
16 changes: 16 additions & 0 deletions docs/skills/desktop-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ The TOML's sections are the contract's table of contents:
`99-flatpaks.sh` privileged-setup hook, and the system-flatpaks Brewfile
whose app list the contract enumerates.
- **`[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.service`, `uupd.timer`. Update policy delegates
Expand Down Expand Up @@ -233,6 +234,21 @@ under `[services]` in `packages/utah.toml` and configured in
`scripts/configure-services.sh`, which also disables `PrivateTmp` on
`systemd-resolved.service` for bootc early-boot DNS resolution.

### Discovery and hybrid-GPU services (#387)

Keep build-time enablement in `scripts/configure-services.sh` aligned with
`85-utah-desktop.preset`: the script configures the image and the preset
preserves the policy when first-boot presets are applied. Bluefin's
`enable avahi-daemon.*` covers both the service and socket for mDNS discovery;
list both explicitly in the script and preset. `switcheroo-control.service`
supports launching applications on a discrete GPU. `switcheroo-control` is
already in the copied Bluefin package contract; Avahi's client libraries
are not the daemon, so `[services]` in `packages/utah.toml` explicitly
requests `avahi` (#104). Require the full pinned-repository transaction to
resolve before building. The desktop contract checks all three units with
`systemctl is-enabled` in the composed image; discovery and discrete-GPU
launching still need runtime verification on the relevant network/hardware.

### The serial getty is masked (#103)

Two Hummingbird defaults compose into a desktop bug. The base declares the
Expand Down
2 changes: 1 addition & 1 deletion docs/skills/package-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ default branch, preventing unrelated upstream changes from breaking Utah's CI.
Update it whenever synchronizing `packages/bluefin.toml` with upstream.

Current counts, per the README "Package parity" section: 61 Bluefin contract
packages installed, 90 Utah additions (GNOME 51, base-image parity, device
packages installed, 91 Utah additions (GNOME 51, base-image parity, device
firmware, desktop services), 7 genuinely unavailable. `scripts/check-doc-counts.py` (part of
`just check`) recomputes these from the manifests and fails if either
document drifts from `site/data/packages.json`.
Expand Down
4 changes: 4 additions & 0 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ packages = [
# Bluefin's desktop image adds these to the server base before 40-services.sh
# enables their units. uupd is downloaded separately because it is published
# as a release binary rather than an RPM in the Hummingbird repositories.
# Avahi's client libraries do not install the daemon. The explicit avahi
# request supplies avahi-daemon.service/socket enabled by the desktop policy
# (#104, #387); switcheroo-control is already in the Bluefin contract.
#
# systemd-resolved and flatpak are not in the Bluefin contract because Fedora's
# base image already carries them. Hummingbird's bootable base does not.
Expand Down Expand Up @@ -321,6 +324,7 @@ packages = [
# systemd-oomd's pressure-based kills. Revisit it as its own change against
# #384's OOM question rather than assuming the omission was an oversight.
packages = [
"avahi",
"cryptsetup",
"flatpak",
"fwupd",
Expand Down
4 changes: 4 additions & 0 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
# Bluefin defaults for mDNS discovery and hybrid-GPU application launching.
enable_unit avahi-daemon.service
enable_unit avahi-daemon.socket
enable_unit switcheroo-control.service
enable_unit firewalld.service
enable_unit fwupd.service
enable_unit fwupd-refresh.timer
Expand Down
3 changes: 2 additions & 1 deletion site/data/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
"blurb": "Units Bluefin adds on top of the server base; the preset cannot enable what was never installed.",
"id": "services",
"packages": [
"avahi",
"cryptsetup",
"flatpak",
"fwupd",
Expand Down Expand Up @@ -208,7 +209,7 @@
}
],
"totals": {
"installed": 151,
"installed": 152,
"unavailable": 7
},
"unavailable": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# Keep these in /usr/lib so bootc's first-boot preset application sees them.
enable gdm.service
enable bluetooth.service
# Match Bluefin discovery and hybrid-GPU defaults.
enable avahi-daemon.service
enable avahi-daemon.socket
enable switcheroo-control.service
enable firewalld.service
enable fwupd.service
enable fwupd-refresh.timer
Expand Down
Loading