Skip to content

fix: fetch the correct uuid of boot partition#703

Merged
yoguo merged 1 commit intovirt-s1:masterfrom
yoguo:master
Mar 27, 2026
Merged

fix: fetch the correct uuid of boot partition#703
yoguo merged 1 commit intovirt-s1:masterfrom
yoguo:master

Conversation

@yoguo
Copy link
Copy Markdown
Contributor

@yoguo yoguo commented Mar 27, 2026

Summary by Sourcery

Bug Fixes:

  • Fix incorrect selection of the boot partition UUID when configuring FIPS, correctly handling systems where /boot is on a separate partition or on the root filesystem.

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Mar 27, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adjusts FIPS boot parameter handling to detect the actual /boot device and only set boot=UUID when appropriate, instead of always using the UUID of the partition labeled "root".

File-Level Changes

Change Details Files
Determine the correct boot device and conditionally add the boot=UUID kernel argument for FIPS enabling.
  • Replace hardcoded lookup of UUID for LABEL="root" with detection of the filesystem backing /boot using df -P /boot
  • Treat systems where /boot is on the root filesystem (df output ends with ' /') by omitting the boot=UUID argument entirely
  • When /boot is on a separate device, query its UUID via blkid -s UUID -o value and construct a boot=UUID= argument
  • Build the grubby command as fips=1 plus the optional boot=UUID argument rather than always including a boot parameter
os_tests/tests/test_lifecycle.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey - I've left some high level feedback:

  • The detection of whether /boot is on the root filesystem by checking boot_device_out.strip().endswith(' /') is brittle; consider parsing df -P /boot into columns and comparing the mountpoint column directly to '/' for more robust behavior.
  • When building the blkid command, it would be safer to quote or otherwise sanitize boot_device (e.g., using shlex.quote) instead of interpolating it directly into the shell command string.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- The detection of whether /boot is on the root filesystem by checking `boot_device_out.strip().endswith(' /')` is brittle; consider parsing `df -P /boot` into columns and comparing the mountpoint column directly to `'/'` for more robust behavior.
- When building the `blkid` command, it would be safer to quote or otherwise sanitize `boot_device` (e.g., using `shlex.quote`) instead of interpolating it directly into the shell command string.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@yoguo yoguo merged commit 7bbdc47 into virt-s1:master Mar 27, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant