Skip to content

feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) - #1309

Merged
hanthor merged 44 commits into
mainfrom
fold/dakota-sq
Nov 20, 2026
Merged

hanthor merged 44 commits into
mainfrom
fold/dakota-sq

Conversation

@hanthor

@hanthor hanthor commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

Dakota parity, part 2 (epic #1236). Stacked on #1248. This folds the structural and quick-win chains into one landing so they need one strict-up-to-date CI cycle. Each commit is one of the original PRs, rebased; conflicts were resolved toward #1284's enable-by-default model.

Structural:

Quick wins:

Not included, owner decision (2026-11-18): homed. No with-systemd-homed PAM, no homed-firstboot drop-in, no homed nsswitch assertion; systemd-homed-firstboot.service is disabled in 98-utah-enable-default.preset and asserted off. Utah keeps Fedora's account model for a clean migration path, and GNOME OS has not moved to homed either. #1238 stays open.

Also fixed: the orphaned chrony account (left in /etc/passwd and /etc/group after chrony is erased) failed bootc container lint --fatal-warn; qemu-kvm waits in [unavailable] until virtiofsd publishes; ublue-firstboot-date units say Utah.

Verified: umask 022; just check passes (1364 tests). Not booted yet: the LUKS e2e / review VM run is still owed before release (the /home bind mount carries the installer /etc/skel risk above).

Assisted-by: Claude Opus via GitHub Copilot

@github-actions github-actions Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2026
@github-actions

github-actions Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hanthor

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hivecommons-hive

hivecommons-hive Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor
ea63eaf

ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blocked

Hive flagged this PR (author @hanthor, head ea63eaf79bc2) because it matches behaviors that can override security controls, escalate privileges or damage the codebase. This is a heuristic, not an accusation — a maintainer should confirm the change is intended before it merges.

  • sensitive_path — changes 1 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • Justfile
  • test_removal — deletes 1 test file(s) (Deletes test files or guts test coverage)
    • tests/test_chrony_fallback.py

Hive did not add the sentinel-alert label because this author is trusted. The finding remains recorded for audit and the dashboard Security tab; set sentinel.trusted_authors_block: true to require the blocking label for trusted authors too.

@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 16, 2026
@hivecommons-hive

hivecommons-hive Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

@hanthor this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (6 waiting): fixes are handed out before new work as soon as you have capacity.

@Danathar Danathar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stand-in review (the hive's reviewers are out of quota). Requesting changes for two verified problems; the rest of the fold looks good. I matched every commit against its original PR. #1284, #1286, #1293 and #1283's are identical, #1289's too, and the others differ only by regenerated package counts. The nsswitch fix merges the two assertions correctly.

1. qemu-kvm can't be installed from the pinned factory yet (from #1298). contract fails at check-repos: nothing provides vhostuser-backend(fs) needed by qemu-system-x86-2:11.1.3-1.hum1.bfin (job). That capability comes from virtiofsd, which packages/utah.toml:745 keeps in [unavailable], while qemu-kvm is in [parity] (line 232). Name presence in the factory isn't a resolvable transaction (Karibhou warned about this on #1232). Fix: move qemu-kvm to [unavailable] beside virtiofsd until utah-packages#1147 publishes it, or land that first. After the fix, confirm the new qemu-guest-agent/vmtoolsd entries in [services].enabled pass systemctl is-enabled; CI never got that far.

2. #1299's two problems came in unchanged (my change request there): check-local-overrides is dropped, but tests/common/features/common_ujust.feature:8 and common_scripts.feature:59 (@common @bluefin, which matches Utah) run it, and toggle-user-motd (system_files/shared/usr/share/ublue-os/just/default.just:62) still toggles ~/.config/no-show-user-motd, which Common's uwelcome.sh moves to ~/.config/uwelcome/disabled, so it can't re-enable. Keeping Common's check-local-overrides and uwelcome toggle recipes in 60-custom.just fixes both.

Checked and fine:

  • /home bind mount (#1293): home.mount is Dakota's plus a ConditionPathIsDirectory guard, and the migration unit carries the dakota#1491 regex fix. The image's /home must be empty, /var/home is untouched on upgrade, the mount is Wants-linked before local-fs.target, and SELinux labels stay on the /var/home inode. Rollback resolves /home/<u> through the old symlink. I found no data-loss path. Before release: run just luks-test. Installs from before 10-05 can have /var/home/<u> passwd fields, which the migration rewrites, and rootless podman compares its storage path only through EvalSymlinks, so a toolbox/distrobox database recorded under /var/home may report "does not match" (read in libpod/sqlite_state.go, not run); a release note would help.
  • zswap (#1292): the files match Dakota's (plus restorecon), chattr +C is set before dd for btrfs, the zstd initramfs drop-in is build-guarded, and the static swap.target.wants link reaches existing installs. Not blocking: the first boot after upgrade writes up to 8 GiB on the boot path; a power cut mid-dd leaves a headerless file that's never recreated (write a temp file and rename after mkswap); small disks silently get no swap; non-LUKS installs now page to disk unencrypted.
  • containerd/runc removal (#1298): nothing in Utah, Common or the testsuite uses them (podman runs on crun), and dakota-devmode is byte-identical to Dakota's.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Needs a manual merge decision: the PR removes tests, which the lane never merges unattended.

Head: verdict approved @08d5b9c, 7/8 checks green, 1 pending, required not reported: build_main / Check all testing builds successful, soak 0s of 30m0s.

What to do: a maintainer must review and merge this PR manually; an approving review or /hive approve does not override this lane's manual-merge rule.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Nov 19, 2026
# Conflicts:
#	README.md
#	docs/skills/package-contract.md
#	site/data/packages.json

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary: This pull request brings Utah, a Linux desktop image, closer to its sister project Dakota. The newest update only pulled in recent work from the main branch. That merge quietly undid one of this pull request's own documentation edits. The packaging guide now says Utah ships the old video-preview tool. The package list itself still ships the new one.

What I need from you: Restore the three lost doc passages (suggested fixes are attached to the lines).


Delta re-review: 08d5b9c → 1440fd8. The delta is the merge of upstream main (#1141, #1338, #1344, #1345). The release-trigger, promotion-ratchet, workflow and gnome-extension files come only from main and are not part of this PR's net diff, so nothing here changes them. Every PR-owned file keeps its net diff except docs/skills/package-contract.md. Before the merge, the PR changed that file by +9/−7. After it, the change is only +3/−3 (the count lines). The merge kept main's thumbnailer text.

docs-currency

  • docs/skills/package-contract.md:115, :128, :136-138 now say ffmpegthumbnailer is in [factory].parity and installed, and that gst-thumbnailers is "not published in this pin". The manifest at this head says the opposite. packages/utah.toml:546-553 installs gst-thumbnailers as the #1262 replacement, and packages/utah.toml:908 lists it in [factory].parity. ffmpegthumbnailer does not appear anywhere in the manifest. The previous head had the right text. Fixes are in the inline threads. They put back the #1262 wording and keep main's new Japanese-input paragraph (lines 69-75).

The previous review had no findings, so there is nothing to mark fixed or still present. The new head's check runs (contract, prow, pinned_fetches) are green; kernel_cache is still running.

No findings from: correctness, security, intent-alignment, style.

Findings not on a changed line

  • docs/skills/package-contract.md:115: The merge from main brought back the old name here. packages/utah.toml:908 lists gst-thumbnailers in [factory].parity, not ffmpegthumbnailer.

    The four requested overrides and `gst-thumbnailers` are in `[factory].parity`;
    
  • docs/skills/package-contract.md:128: The merge also dropped the #1262 explanation. The manifest installs gst-thumbnailers (packages/utah.toml:546-553), not ffmpegthumbnailer.

    `gst-thumbnailers`, `gnome-epub-thumbnailer`, and the Papers thumbnailer.
    `gst-thumbnailers` replaced `ffmpegthumbnailer` (#1262), as on Dakota: both
    claim the same video MIME types, GNOME uses one thumbnailer per type, and
    only the GStreamer one can preview H.264 (through `openh264dec`).
    
  • docs/skills/package-contract.md:136-138: This says gst-thumbnailers is not published in this pin, but this PR installs it from the pinned factory and lists it in [factory].parity (packages/utah.toml:908). The previous head had this wording:

    Remaining #383 gaps include full FFmpeg (the decided direction, replacing
    `-free`) and hardware/codec proof. Keep #383 open for those.
    

Confidence: 3/5 (needs attention) — 1 medium finding; 1 perspective requested changes

-- hive: agent=reviewer backend=claude model=claude-opus-5-5 effort=medium claude=2.1.327

hanthor and others added 2 commits November 20, 2026 02:45
At factory c288398 virtiofsd publishes, but qemu-common needs
ipxe-roms-qemu and qemu-ui-sdl needs SDL2_image, neither in the factory or
Hummingbird, and libvirt is unpublished. Keep all five in [unavailable],
tracked by the reopened utah-packages#1021, and stop claiming QEMU/KVM is
installed.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 20, 2026
@hanthor

hanthor commented Nov 20, 2026

Copy link
Copy Markdown
Member Author

@Danathar could you re-review? Every point from your 11-16 and 11-17 reviews is addressed on the current head (ea63eaf7):

  1. qemu-kvm not installable (11-16 Build Utah on Hummingbird with the GNOME 51 stack, all four flavors #1): qemu-kvm stays in [unavailable] beside virtiofsd and libvirt; contract / check-repos pass. Re-checked against the newer factory pin c288398 (chore(deps): update ghcr.io/projectbluefin/utah-packages:latest docker digest to c288398 #1347): virtiofsd now publishes but still doesn't resolve (qemu-common needs ipxe-roms-qemu; qemu-ui-sdl needs SDL2_image; libvirt unpublished), so all five stay [unavailable]. The comment in packages/utah.toml now names those missing deps, and the tracker parity(dakota): import virtualization and SPICE components utah-packages#1021 is reopened with the evidence. qemu-guest-agent.service / vmtoolsd.service are in [services].enabled and resolve to enable under the presets (ServiceMaskParityTests).
  2. toggle-user-motd (11-16 Codex/utah packages health #2, 11-17 Build Utah on Hummingbird with the GNOME 51 stack, all four flavors #1): it now runs Common's uwelcome toggle (default.just:62-68), so state lives in ~/.config/uwelcome/disabled; tested.
  3. check-local-overrides (11-16 Codex/utah packages health #2, 11-17 Codex/utah packages health #2): Common's recipe is back in default.just (common 0033d4530aee); tested.
  4. Gaming kernel zswap (11-17 chore: Configure Renovate #3): scripts/install-ogc-kernel.sh enables ZSWAP and CRYPTO_ZSTD (built in), adds both to the required list and gates with require_config '^CONFIG_ZSWAP=y$' / '^CONFIG_CRYPTO_ZSTD=y$'; the ZRAM option and gate went with zram-generator. The zram test became a zswap test and kernel-cache.md describes zswap.
  5. Nit, "Dakota" descriptions: ublue-firstboot-date.service and .path say Utah.
  6. Also, from the owner's 11-18 decision: homed is dropped (no with-systemd-homed, no homed-firstboot drop-in, no homed nsswitch assertion; systemd-homed-firstboot.service disabled by preset), and the PR no longer closes parity(dakota): homed-aware PAM and systemd-homed-firstboot #1238. The build's bootc lint caught an orphaned chrony account; configure-services.sh removes it.

Before release (not merge): the LUKS e2e / review-VM run on the final head is still owed, as you asked.

just check passes locally on this head.

Posted with Claude Code

@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 20, 2026
Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 20, 2026
The merge of main brought back ffmpegthumbnailer in package-contract.md.
The manifest installs gst-thumbnailers (#1262) and lists it in
[factory].parity, so the doc says so again.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hanthor added a commit that referenced this pull request Nov 20, 2026
#1309 moved services to enable-by-default with preset-all, so the per-unit
enable lines this branch added are dropped; kanata stays off through 98's
80-kanata disable. dakota-config-firstboot-date owns ublue-firstboot-date's
units and script, so Utah's copies go and two drop-ins keep their Utah
descriptions. bluefin-stats-refresh is gone, so its preset line goes too.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 20, 2026
Conflicts: packages/utah.toml kept both sides (#1359 tools and this PR's ifuse/opensc/gst-thumbnailers); README and package-contract counts regenerated.

Assisted-by: Claude Opus via GitHub Copilot

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Nov 20, 2026
@hanthor

hanthor commented Nov 20, 2026

Copy link
Copy Markdown
Member Author

Pre-merge: head 1d93f2fe (main merged in; utah.toml kept both sides with #1359's tools, counts regenerated). contract, kernel_cache and all four image builds plus both 'Check all testing builds successful' jobs are green (run); just check passes. The reviewer's thumbnailer finding is fixed in 9f863b70 (gst-thumbnailers wording restored in package-contract.md). Danathar's points are answered above; the LUKS e2e / review-VM boot is still owed before release, not merge. Admin-squashing so the stacked #1297 → #1295 → #1304 can land.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. author/clanker A contributor's own hive authored this PR under their login no-dco A commit is missing Signed-off-by — run `git rebase --signoff` role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

2 participants