Skip to content

feat(desktop): adopt Dakota system defaults and logind sleep defaults - #1250

Closed
hanthor wants to merge 1 commit into
feat/dakota-service-presetsfrom
feat/dakota-system-tweaks
Closed

hanthor wants to merge 1 commit into
feat/dakota-service-presetsfrom
feat/dakota-system-tweaks

Conversation

@hanthor

@hanthor hanthor commented Nov 16, 2026

Copy link
Copy Markdown
Member

Part 3/7 of the Dakota parity stack (epic #1236). Base: feat/dakota-service-presets; review and merge in order.

Copy Dakota's (projectbluefin/dakota, branch testing) small system
defaults into Utah:

  • usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf from
    files/wireplumber/ (elements/bluefin/wireplumber-pcsp.bst) hides the
    PC-speaker ALSA card so it cannot become the default sink after resume
    (Resume selects PC-speaker sink, causing silence and slow video dakota#1248).
  • usr/lib/sysctl.d/60-kexec-disable.conf from
    elements/bluefin/kexec-disable.bst sets kernel.kexec_load_disabled = 1.

Dakota's files/polkit/org.freedesktop.NetworkManager.rules is already
shipped, with an identical rule, by Hummingbird's NetworkManager RPM at
/usr/share/polkit-1/rules.d/, so Utah asserts it in the desktop
contract instead of overlaying the package-owned file.

Drop the suspend-then-hibernate logind override inherited from
bluefin-lts's 40-services.sh. Dakota ships no logind or sleep override,
and Utah's only swap is zram, so hibernate had no resume target. Lid and
sleep actions now use systemd-logind's defaults (suspend).

The desktop contract asserts all three files and their key settings;
the desktop-contract skill documents them.

Verified: just check passes at the stack tip (1,329 tests). An image build hasn't run yet.

Copy Dakota's (projectbluefin/dakota, branch testing) small system
defaults into Utah:

- usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf from
  files/wireplumber/ (elements/bluefin/wireplumber-pcsp.bst) hides the
  PC-speaker ALSA card so it cannot become the default sink after resume
  (projectbluefin/dakota#1248).
- usr/lib/sysctl.d/60-kexec-disable.conf from
  elements/bluefin/kexec-disable.bst sets kernel.kexec_load_disabled = 1.

Dakota's files/polkit/org.freedesktop.NetworkManager.rules is already
shipped, with an identical rule, by Hummingbird's NetworkManager RPM at
/usr/share/polkit-1/rules.d/, so Utah asserts it in the desktop
contract instead of overlaying the package-owned file.

Drop the suspend-then-hibernate logind override inherited from
bluefin-lts's 40-services.sh. Dakota ships no logind or sleep override,
and Utah's only swap is zram, so hibernate had no resume target. Lid and
sleep actions now use systemd-logind's defaults (suspend).

The desktop contract asserts all three files and their key settings;
the desktop-contract skill documents them.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@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: danathar, 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

@hanthor hanthor mentioned this pull request Nov 16, 2026
1 of 30 tasks
@hivecommons-hive hivecommons-hive Bot added 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 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

Withdrawn: this PR is not back in your court after all. The failing checks (contract) are red on the base branch too; this change did not break them. There is nothing to fix here: the PR is back on the normal path, and the hive checks it again once the base branch is green.

@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 16, 2026

@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). Approving: small, faithful copies of Dakota's defaults, plus the sleep cleanup.

Checked:

  • 60-kexec-disable.conf and 51-disable-pcsp.conf match Dakota's kexec-disable.bst and files/wireplumber/51-disable-pcsp.conf.
  • The contract asserts all three files and their key contents. The polkit strings match Dakota's files/polkit/org.freedesktop.NetworkManager.rules.
  • Dropping the suspend-then-hibernate sed is right. Dakota ships no logind override, and zram-only swap can't hibernate anyway. Nothing else references HandleLid*/SleepOperation, and the testsuite has no lid or sleep scenario.

One thing to confirm: this relies on Hummingbird's NetworkManager RPM already shipping the wheel polkit rule at /usr/share/polkit-1/rules.d/org.freedesktop.NetworkManager.rules with that text, because there's no overlay. If it doesn't, the in-image contract check fails at build. Worth confirming with rpm -ql NetworkManager or one built image.

Release notes: closing the lid now suspends, kexec is disabled, and the PC-speaker card no longer becomes the default audio sink after resume.

@Danathar

Copy link
Copy Markdown
Contributor

Answering my own question from the review: the polkit rule is shipped. Fedora's NetworkManager.spec builds with polkit_noauth_group=wheel by default (%bcond_without polkit_noauth_group) and packages %{_datadir}/polkit-1/rules.d/org.freedesktop.NetworkManager.rules. NetworkManager's own template (data/org.freedesktop.NetworkManager.rules.in at 1.58.0) contains exactly the three strings the contract checks: action.id == "org.freedesktop.NetworkManager.settings.modify.system", subject.isInGroup("wheel") and subject.local. Utah installs NetworkManager 1.58.1-5.hum1, Hummingbird's rebuild of that spec, so the check should pass. The one caveat is if Hummingbird turned that bcond off. The first image build will show it.

@hanthor

hanthor commented Nov 16, 2026

Copy link
Copy Markdown
Member Author

Folded into #1248, which carries this change unchanged in one rebased series so the stack lands in a single CI cycle. Closing here; review continues on #1248.

@hanthor hanthor closed this Nov 16, 2026
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

Development

Successfully merging this pull request may close these issues.

2 participants