Repository navigation
Preserve existing initramfs modules on Surface devices - #8151
jovial-liu wants to merge 11 commits into
Conversation
1cc93d8 to
43bfe9b
Compare
There was a problem hiding this comment.
Pull request overview
Preserves existing initramfs modules when configuring Surface keyboard support.
Changes:
- Appends Surface modules to
MODULESinstead of replacing existing entries.
Tip
If you aren't ready for review, convert to a draft PR.
Click "Convert to draft" or run gh pr ready --undo.
Click "Ready for review" or run gh pr ready to reengage.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| echo "Detected pinctrl module: $pinctrl_module" | ||
| mkdir -p /etc/mkinitcpio.conf.d | ||
| echo "MODULES=(${pinctrl_module} surface_aggregator surface_aggregator_registry surface_aggregator_hub surface_hid_core surface_hid surface_kbd intel_lpss_pci 8250_dw)" > \ | ||
| echo "MODULES+=(${pinctrl_module} surface_aggregator surface_aggregator_registry surface_aggregator_hub surface_hid_core surface_hid surface_kbd intel_lpss_pci 8250_dw)" > \ |
|
Reviewed at e9dcebd against Reproduced on a disposable Omarchy worker. I wrote
No second opinion. The configured reviewer (Codex Medium) refused this run because its daily review quota was spent. Only one model has checked this, so it is not marked ready. Two things for the maintainer, neither a defect in this change:
Waiting on the second opinion, then the maintainer. |
Use the pinctrl module change from omacom#8151 by @jovial-liu. Co-authored-by: kaixin liu <184472154+jovial-liu@users.noreply.github.com>
[Medium impact] The PR appears safe to merge; no new actionable issues were found. SummaryPreserves existing initramfs modules when Surface keyboard setup runs.
Reviews (6) · Last reviewed commit: "Keep the Surface migration pending when ..." · Reviewed by Greptile |
The rewritten comment says older surface_device_modules.conf files can strip nvidia_drm after kms was dropped, but no longer says why that never happens: every Surface Omarchy writes the file for has a non-NVIDIA iGPU, so the scan below keeps kms. Without that, the comment describes a hazard that cannot occur and drops the instruction that keeps it that way. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
The sentence this reverts claimed every Surface has a non-NVIDIA iGPU that keeps kms, but a Surface Studio 2 reports its GTX 1070 as its only display controller, so the claim is not one the code can rest on. The contributor's wording, that an older file may strip nvidia_drm after kms was dropped, is the accurate one. This reverts commit e7a1265. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
Reviewed at e9dcebd against Reproduced on a disposable Omarchy worker. I wrote
No second opinion. The configured reviewer (Codex Medium) refused this run because its daily review quota was spent. Only one model has checked this, so it is not marked ready. Two things for the maintainer, neither a defect in this change:
Waiting on the second opinion, then the maintainer. |
|
The comment just above this one was posted by mistake. It is a stale copy of the September 28 review of e9dcebd, and what it says about the second opinion and readiness is out of date. This is the current review. Reviewed again at ffe0fad against Reproduced on a disposable Omarchy worker. I stubbed Surface detection and a Second opinion: Codex Medium, three rounds. It found no defect in the fix. In the first round it pointed out that your rewrite dropped the old comment's reason why an old This is the only open fix for #7111. #14195 makes the same one-line change as part of its AMD Surface work, but its migration skips machines that already have a pinctrl module. So it does not compete with this one, and whichever lands second will need a trivial rebase. One thing remains for the maintainer: Surface installs from before this change keep their |
quattro moved the Surface keyboard script onto $mkinitcpio_dir and gated it on x86, so the append is carried onto that line. Its new tests pinned the old MODULES= form: surface-hardware-test now expects MODULES+=, and the hooks test's Surface fixture is what the installer writes now, so it keeps the NVIDIA modules ahead of the Surface ones and covers omacom#7111. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Installs from before this change still carry a MODULES= surface_device_modules.conf, so the hooks test composes both generations rather than only the new one. Co-Authored-By: Codex Medium <noreply@openai.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
This stopped merging cleanly after #14820 changed What I pushed. 22dbbeb is the merge. Reproduced on a disposable Omarchy worker at b9cb375, against Second opinion: Codex Medium, two rounds. It found no defect in the fix or in how the conflict was resolved. In the first round it pointed out that replacing the older-drop-in case would lose coverage for existing installs. That is why the older case is kept beside the new one. The second round, at b9cb375, found nothing open. Codex can read this session's transcript, so treat its agreement as agreement, not independent proof. One thing is still the maintainer's call: Surface installs from before this change keep their |
The installer now appends, but a Surface installed before this keeps the MODULES=(...) drop-in, which sorts after nvidia.conf and drops its modules from every initramfs. The migration rewrites only a file that is exactly what the installer wrote, then rebuilds once per machine, with a marker so another user skips a finished rebuild and an interrupted one is retried. Carried over from omacom#14541 under a fresh timestamp, since 1791403252 is already taken on quattro. The omarchy_hooks.conf comment now states the rule instead of describing the old Surface file as the exception. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…rl module Omarchy 3's installer wrote surface_device_modules.conf even when pinctrl detection failed, as MODULES=( surface_aggregator ...). That file resets MODULES the same way, so the migration matches it too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
Reviewed by Claude Opus 5.5, with a second opinion from Codex Medium over two rounds, and run on a worker. This now carries the repair for existing installs from #14541, which competed with this pull request for #7111. This one is older and makes the same installer change, so it is the one to land. The installer fix alone only changes what new installs get. A Surface that already has the
On the worker, with the old drop-in beside One limit: This now waits on the maintainer. Once it lands, #14541 can be closed. |
quattro folded surface-hardware-test.sh into the table-driven hardware-quirks-test.sh, so the Surface installer assertion moves there and now expects MODULES+=(. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
quattro's AGENTS.md now forbids tests for migrations, since a migration is frozen once it ships, so the test file goes and with it the OMARCHY_SURFACE_* overrides that only it used. The migration takes a fresh timestamp so it sorts after the ones quattro has added since, keeping the queue in order. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
limine-mkinitcpio reports a kernel it could not rebuild and still exits 0, so the migration wrote its marker and omarchy-migrate marked it done while that kernel's image still lacked the NVIDIA modules. Check its output for the failure the way migrations/1791621765.sh does, and exit non-zero so the migration stays pending. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
Reviewed again by Claude Opus 5.5, with second opinions from Codex Medium and muse-wonder (pi, thinking high) over two rounds, and run on a worker. This had stopped merging cleanly into
Here is what ran on the worker, against
CI's Both reviewers found the rebuild issue above, and both came back clean on the second round. Their independence is not guaranteed. One choice is left for the maintainer. The migration rebuilds the boot image on every Surface with the installer's file, even one without This waits on the maintainer, and on a green CI run. Once this lands, #14541 can be closed. |
Fixes #7111
Append the Surface-specific modules to MODULES instead of replacing the existing list. This preserves NVIDIA modules when the Surface hardware setup runs after the NVIDIA configuration.