diff --git a/README.md b/README.md index 7322737b4..21e411b5f 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ than being noticed later. | | count | | --- | --- | | Bluefin contract installed | **57** | -| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 84 | +| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 85 | | Genuinely unavailable | **10** | The install writes its resolved list to `/usr/share/utah/contract.txt` and the diff --git a/contracts/bluefin-desktop.toml b/contracts/bluefin-desktop.toml index 777ac10cc..1a1506c55 100644 --- a/contracts/bluefin-desktop.toml +++ b/contracts/bluefin-desktop.toml @@ -130,6 +130,7 @@ apps = [ [services] enabled = [ + "avahi-daemon.service", "bluetooth.service", "bootc-unified-storage.service", "brew-setup.service", @@ -140,6 +141,8 @@ enabled = [ "gdm.service", "input-remapper.service", "ModemManager.service", + "systemd-resolved.service", + "tailscaled.service", "ublue-system-setup.service", "uupd.timer", ] diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md index 1fb170551..76c9aa936 100644 --- a/docs/skills/desktop-contract.md +++ b/docs/skills/desktop-contract.md @@ -105,9 +105,10 @@ configures authselect, and removes the extension build toolchain before cleanup (Containerfile RUN comment; originated in `docs/building.md`'s former design section and now lives in this skill). -Hummingbird's base does not include `systemd-resolved` by default; it is listed -under `[services]` in `packages/utah.toml` and configured in -`scripts/configure-services.sh`, which also disables `PrivateTmp` on +Hummingbird's base does not include `systemd-resolved` or `avahi` by default; +they are listed under `[services]` in `packages/utah.toml` and configured in +`scripts/configure-services.sh`, which enables `avahi-daemon.service` for mDNS +and geoclue WiFi location, and disables `PrivateTmp` on `systemd-resolved.service` for bootc early-boot DNS resolution. ### The serial getty is masked (#103) diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index 660fb64c1..41a4aaa68 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -165,7 +165,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: 57 Bluefin contract -packages installed, 84 Utah additions (GNOME 51, base-image parity, device +packages installed, 85 Utah additions (GNOME 51, base-image parity, device firmware, desktop services), 10 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`. diff --git a/packages/utah.toml b/packages/utah.toml index 6c0cbdb41..db507a253 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -276,7 +276,10 @@ packages = [ # -- and an installed system whose disk is encrypted could not manage its own # keys. The initramfs already carries the crypt and systemd-cryptsetup dracut # modules, so unlocking was never the gap; creating the volume was. +# +# avahi provides avahi-daemon for mDNS and geoclue WiFi-based location (#104). packages = [ + "avahi", "cryptsetup", "flatpak", "fwupd", @@ -340,8 +343,7 @@ packages = [ # more than dial-up: Hummingbird ships NetworkManager-ppp (1.58.0-1.hum1 # and 1.58.1-1.hum1) whose metadata carries Requires: ppp, so that plugin # is uninstallable from their own repository and NetworkManager's PPPoE and -# PPTP paths cannot be installed at all. The same shape as avahi (#104): -# a plugin shipped without the daemon behind it. +# PPTP paths cannot be installed at all. # Tracked by #107. # # grub2-efi-x64-cdboot diff --git a/scripts/configure-services.sh b/scripts/configure-services.sh index f1bab100e..09ec52624 100644 --- a/scripts/configure-services.sh +++ b/scripts/configure-services.sh @@ -73,6 +73,7 @@ enable_unit tailscaled.service enable_unit uupd.timer enable_unit ublue-system-setup.service enable_unit systemd-resolved.service +enable_unit avahi-daemon.service enable_unit bootc-unified-storage.service # input-remapper is installed by Bluefin's package set, but without its root # daemon running, udev autoload fails on input devices and the GUI prompts for diff --git a/site/data/packages.json b/site/data/packages.json index 541d95b72..b50230dab 100644 --- a/site/data/packages.json +++ b/site/data/packages.json @@ -1,5 +1,5 @@ { - "generated_at": "2026-09-26", + "generated_at": "2026-09-27", "generator": "scripts/generate-site-data.py", "groups": [ { @@ -174,6 +174,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", @@ -198,7 +199,7 @@ } ], "totals": { - "installed": 141, + "installed": 142, "unavailable": 10 }, "unavailable": [ diff --git a/system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset b/system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset index 2c2cd314a..0004da7b4 100644 --- a/system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset +++ b/system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset @@ -9,6 +9,7 @@ enable tailscaled.service enable uupd.timer enable ublue-system-setup.service enable systemd-resolved.service +enable avahi-daemon.service enable bootc-unified-storage.service enable dconf-update.service enable input-remapper.service diff --git a/tests/test_package_resolution.py b/tests/test_package_resolution.py index 08f07f471..d88ad18f1 100644 --- a/tests/test_package_resolution.py +++ b/tests/test_package_resolution.py @@ -169,7 +169,7 @@ def test_check_requires_hummingbird_and_utah_packages(self): overlay = dirpath / "utah.toml" base.write_text('[fedora]\npackages=["base"]\n') overlay.write_text('[gnome]\npackages=[]\n') - + # Missing hummingbird repos_dir = dirpath / "repos" repos_dir.mkdir() @@ -251,6 +251,14 @@ def test_check_parity_recipe_guards_the_ref_format(self): "Justfile check-parity recipe must validate the SHA format before fetching", ) + def test_services_section_includes_avahi_and_preset_enables_it(self): + services = installer.section(self.OVERLAY, "services") + self.assertIn("avahi", services) + preset = (ROOT / "system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset").read_text() + self.assertIn("enable avahi-daemon.service", preset) + configure_services = (ROOT / "scripts/configure-services.sh").read_text() + self.assertIn("enable_unit avahi-daemon.service", configure_services) + class ImageSizeTests(unittest.TestCase): MOUNT = "--mount=type=bind,from=packages,source=/repository,target=/etc/utah-packages,ro"