From 10613a1695bae99d220062c29b4423aaf765722c Mon Sep 17 00:00:00 2001 From: Karibhou <157208370+Karibhou@users.noreply.github.com> Date: Mon, 16 Nov 2026 04:55:06 +0100 Subject: [PATCH 1/2] fix: enable storage checks and network drive discovery Align storage maintenance and discovery with Dakota. Hive-Run: projectbluefin/utah#1271 Hive-Plan: storage-unit parity Hive-Spec: issue-1271#storage-units Assisted-by: openai-codex/gpt-6.1-terra via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com> --- contracts/bluefin-desktop.toml | 7 +++++++ docs/skills/desktop-contract.md | 5 +++++ scripts/configure-services.sh | 7 +++++++ .../usr/lib/systemd/system-preset/85-utah-desktop.preset | 7 +++++++ 4 files changed, 26 insertions(+) diff --git a/contracts/bluefin-desktop.toml b/contracts/bluefin-desktop.toml index a366f46f6..6497a591c 100644 --- a/contracts/bluefin-desktop.toml +++ b/contracts/bluefin-desktop.toml @@ -362,6 +362,12 @@ enabled = [ "sysstat.service", "sysstat-collect.timer", "sysstat-summary.timer", + # Dakota storage maintenance and network storage discovery. + "mdcheck_start.timer", + "mdcheck_continue.timer", + "mdmonitor-oneshot.timer", + "nvmf-autoconnect.service", + "nvmefc-boot-connections.service", "projectbluefin-countme.timer", "switcheroo-control.service", "ublue-system-setup.service", @@ -397,6 +403,7 @@ masked = [ # also socket-activated, and saned is socket-activated from sane-backends-daemon # (not installed today, so saned.socket reports not-found until it is). disabled = [ + "raid-check.timer", "dnsmasq.service", "rpcbind.service", "rpcbind.socket", diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md index 94f411c15..37f67963e 100644 --- a/docs/skills/desktop-contract.md +++ b/docs/skills/desktop-contract.md @@ -106,6 +106,11 @@ The TOML's sections are the contract's table of contents: script and the preset in agreement. Check a booted VM with `systemctl is-enabled ` when in doubt. + Storage parity with Dakota enables the mdadm check and monitoring timers and + the NVMe-over-Fabrics autoconnect services. Fedora's `raid-check.timer` is + disabled to avoid scheduling a second array check. The image contract checks + all six states; keep the build-time enablement and first-boot preset aligned. + The Flathub remote is a `/etc/flatpak/remotes.d` descriptor, applied to the repo once, when `/var/lib/flatpak/repo` is created. Flathub's descriptor has no collection ID, while common's preinstall entries pin diff --git a/scripts/configure-services.sh b/scripts/configure-services.sh index 2867ea840..714e03ab4 100644 --- a/scripts/configure-services.sh +++ b/scripts/configure-services.sh @@ -185,6 +185,13 @@ disable_unit nfs-client.target enable_unit sysstat.service enable_unit sysstat-collect.timer enable_unit sysstat-summary.timer +# Use Dakota's mdadm checks rather than Fedora's overlapping raid-check. +disable_unit raid-check.timer +enable_unit mdcheck_start.timer +enable_unit mdcheck_continue.timer +enable_unit mdmonitor-oneshot.timer +enable_unit nvmf-autoconnect.service +enable_unit nvmefc-boot-connections.service # Printing on demand, as Fedora's preset enables it for Bluefin; Hummingbird's # 99-default-disable would leave it off. enable_unit cups.socket 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 2b7923cdd..2d955bafb 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 @@ -45,6 +45,13 @@ enable intel_lpmd.service enable sysstat.service enable sysstat-collect.timer enable sysstat-summary.timer +# Match Dakota's array checks and NVMe-over-Fabrics discovery. +disable raid-check.timer +enable mdcheck_start.timer +enable mdcheck_continue.timer +enable mdmonitor-oneshot.timer +enable nvmf-autoconnect.service +enable nvmefc-boot-connections.service # 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 -> From 388b86f2003c25b8bd32f18c0df8b130dd1b7768 Mon Sep 17 00:00:00 2001 From: Karibhou <157208370+Karibhou@users.noreply.github.com> Date: Mon, 16 Nov 2026 05:26:42 +0100 Subject: [PATCH 2/2] docs: fix storage service contract skill Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com> --- docs/skills/desktop-contract.md | 40 ++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md index 37f67963e..c4fd4a4d4 100644 --- a/docs/skills/desktop-contract.md +++ b/docs/skills/desktop-contract.md @@ -80,36 +80,30 @@ The TOML's sections are the contract's table of contents: `input-remapper.service`, `ModemManager.service`, `thermald.service`, `intel_lpmd.service`, `sysstat.service`, `sysstat-collect.timer`, `sysstat-summary.timer`, `projectbluefin-countme.timer`, `cups.socket`, `systemd-boot-update.service`, `uupd.timer`, + `mdcheck_start.timer`, `mdcheck_continue.timer`, `mdmonitor-oneshot.timer`, + `nvmf-autoconnect.service`, `nvmefc-boot-connections.service`, `bluefin-stats-refresh.timer`, `ublue-firstboot-date.service`, `ublue-booted-image.service`. + Storage parity disables Fedora's `raid-check.timer` to avoid a second array check. 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 carry active `timers.target.wants` symlinks that bypass uupd staging or undo manual rollbacks. Switchers can also manually verify or mask them if a local `/etc` symlink was preserved. - The last two units are Dakota parity (#675): install-date stamping and the - booted-image snapshot Common's `/usr/libexec/ublue-booted-image` falls back to. - `configure-services.sh` enables them, patches Common's fastfetch ([stats](desktop-contract/references/stats-refresh.md)) - and `uwelcome.sh` (non-interactive shells skip the greeting), and checks image-info ([bootc compatibility](desktop-contract/references/image-info.md)). - Wallpaper rotation is deliberately NOT Dakota parity: Common's per-user `bluefin-dynamic-wallpaper` - timer is hemisphere-aware and rotates live at month boundaries, while - Dakota's boot-time month symlink is northern-only and stale until reboot, so - repointing the default would stand the better rotator down (#675 decision). - - A unit being enabled in the built image is not the same as it being enabled - on a booted one. bootc applies presets on first boot, and Hummingbird's - `99-default-disable.preset` turns off every unit no preset names, so a build - -time `systemctl enable` without a line in `85-utah-desktop.preset` (or a - vendor preset such as brew's `01-homebrew.preset`) is undone. That is how - `flatpak-preinstall.service` shipped "enabled" and booted disabled, leaving - non-ISO installs without Bazaar. `DesktopUnitEnablementTests` holds the - script and the preset in agreement. Check a booted VM with `systemctl - is-enabled ` when in doubt. - - Storage parity with Dakota enables the mdadm check and monitoring timers and - the NVMe-over-Fabrics autoconnect services. Fedora's `raid-check.timer` is - disabled to avoid scheduling a second array check. The image contract checks - all six states; keep the build-time enablement and first-boot preset aligned. + The last two units are Dakota parity (#675): install-date stamping and Common's + booted-image snapshot. `configure-services.sh` enables them, patches Common's + fastfetch ([stats](desktop-contract/references/stats-refresh.md)) and `uwelcome.sh` + (non-interactive shells skip the greeting), and checks [image-info](desktop-contract/references/image-info.md). + Wallpaper rotation is not Dakota parity: Common's per-user timer is + hemisphere-aware and rotates live, unlike Dakota's northern-only boot-time + symlink, which remains stale until reboot (#675 decision). + + A unit enabled in the built image may be disabled on boot: bootc applies + presets, and Hummingbird's `99-default-disable.preset` disables unnamed units. + Build-time enablement needs `85-utah-desktop.preset` or a vendor preset such + as brew's `01-homebrew.preset`; otherwise first-boot Flatpak installs can be + lost. `DesktopUnitEnablementTests` holds the script and preset in agreement. + Check a booted VM with `systemctl is-enabled ` when in doubt. The Flathub remote is a `/etc/flatpak/remotes.d` descriptor, applied to the repo once, when `/var/lib/flatpak/repo` is created. Flathub's descriptor has