Repository navigation
feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) - #1309
Conversation
|
[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 |
ea63eaf
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @hanthor, head
Hive did not add the |
|
@hanthor this PR is back in your court ( Review asks:
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
left a comment
There was a problem hiding this comment.
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.mountis Dakota's plus aConditionPathIsDirectoryguard, and the migration unit carries the dakota#1491 regex fix. The image's/homemust be empty,/var/homeis untouched on upgrade, the mount isWants-linked before local-fs.target, and SELinux labels stay on the/var/homeinode. Rollback resolves/home/<u>through the old symlink. I found no data-loss path. Before release: runjust 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 throughEvalSymlinks, so a toolbox/distrobox database recorded under/var/homemay report "does not match" (read inlibpod/sqlite_state.go, not run); a release note would help. - zswap (#1292): the files match Dakota's (plus
restorecon),chattr +Cis set beforeddfor btrfs, the zstd initramfs drop-in is build-guarded, and the staticswap.target.wantslink reaches existing installs. Not blocking: the first boot after upgrade writes up to 8 GiB on the boot path; a power cut mid-ddleaves a headerless file that's never recreated (write a temp file and rename aftermkswap); 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-devmodeis byte-identical to Dakota's.
|
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 Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
# Conflicts: # README.md # docs/skills/package-contract.md # site/data/packages.json
There was a problem hiding this comment.
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-138now sayffmpegthumbnaileris in[factory].parityand installed, and thatgst-thumbnailersis "not published in this pin". The manifest at this head says the opposite.packages/utah.toml:546-553installsgst-thumbnailersas the #1262 replacement, andpackages/utah.toml:908lists it in[factory].parity.ffmpegthumbnailerdoes 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 keepmain'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 frommainbrought back the old name here.packages/utah.toml:908listsgst-thumbnailersin[factory].parity, notffmpegthumbnailer.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 installsgst-thumbnailers(packages/utah.toml:546-553), notffmpegthumbnailer.`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 saysgst-thumbnailersis 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
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>
|
@Danathar could you re-review? Every point from your 11-16 and 11-17 reviews is addressed on the current head (
Before release (not merge): the LUKS e2e / review-VM run on the final head is still owed, as you asked.
Posted with Claude Code |
Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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>
#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>
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>
|
Pre-merge: head |
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:
ZSWAPandCRYPTO_ZSTDand gates on both (this rebuilds the kernel cache once)toggle-user-motd(drivesuwelcome toggle) andcheck-local-overridesstay Common'sQuick wins:
systemd-homed-firstboot.serviceis the exception: disabled, per the owner decision below. Under feat(services): enable units by default, as GNOME OS and Dakota do #1284's model these are preset lines; the mdadm mdcheck/mdmonitor-oneshot timers stay off, as parity(dakota): Utah-only system services Dakota doesn't run #1268 decidedNot included, owner decision (2026-11-18): homed. No
with-systemd-homedPAM, no homed-firstboot drop-in, no homed nsswitch assertion;systemd-homed-firstboot.serviceis disabled in98-utah-enable-default.presetand 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
chronyaccount (left in/etc/passwdand/etc/groupafter chrony is erased) failedbootc container lint --fatal-warn;qemu-kvmwaits in[unavailable]until virtiofsd publishes;ublue-firstboot-dateunits say Utah.Verified:
umask 022; just checkpasses (1364 tests). Not booted yet: the LUKS e2e / review VM run is still owed before release (the/homebind mount carries the installer/etc/skelrisk above).Assisted-by: Claude Opus via GitHub Copilot