Skip to content

bootctl: minor tweaks#41695

Merged
poettering merged 2 commits into
systemd:mainfrom
poettering:bootctl-tweaklets
Apr 18, 2026
Merged

bootctl: minor tweaks#41695
poettering merged 2 commits into
systemd:mainfrom
poettering:bootctl-tweaklets

Conversation

@poettering
Copy link
Copy Markdown
Member

This is split out of #41543, but makes sense on its own.

If unprivileged_mode is false then verify_esp() will treat access errors
like any other and log about them. Here we set it to false, hence
there's no point to log a 2nd time.
This changes boot_config_load_and_select() to also take the root path as
input, just like the ESP and XBOOTLDR path.

This has the benefit of making the whole file independent of bootctl.c,
which means we can link it into a separate test, and is preparatory work
for a follow-up commit.
@poettering poettering added sd-boot/sd-stub/bootctl please-review PR is ready for (re-)review by a maintainer claude-review labels Apr 17, 2026
@bluca bluca added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed please-review PR is ready for (re-)review by a maintainer labels Apr 17, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 17, 2026

Claude review of PR #41695 (b54af7c)

PR looks good. Two clean commits:

  1. bootctl-cleanup: remove redundant EACCES checks — The EACCES handling in verb_cleanup was redundant since unprivileged_mode=false means errors are already logged at LOG_ERR in verify_esp/verify_xbootldr. Correct removal.

  2. bootspec-util: pass root directory as parameter — Clean refactor that removes bootspec-util.c's dependency on the global arg_root from bootctl.h by threading root as an explicit parameter through boot_config_load_and_select(). All four call sites updated correctly.

No issues found.

Workflow run

@poettering poettering merged commit e705c84 into systemd:main Apr 18, 2026
57 of 63 checks passed
@github-actions github-actions Bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Apr 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants