Skip to content

Conversation

zachspar
Copy link
Contributor

@zachspar zachspar commented Aug 28, 2025

Proposed Changes

Updated the error message for memory cgroup detection to reflect the correct location of the cmdline.txt file on Raspberry Pi systems running Raspberry Pi OS Bookworm or later (released in 2023). The file path has changed from /boot/cmdline.txt to /boot/firmware/cmdline.txt due to the new firmware structure introduced in Raspberry Pi OS Bookworm.

Types of Changes

Docs

Verification

The change can be verified by:

  1. Running k3s on a Raspberry Pi with Raspberry Pi OS Bookworm or later.
  2. Triggering the memory cgroup detection error (e.g., by not having cgroup_memory=1 cgroup_enable=memory in the kernel command line).
  3. Confirming that the error message now correctly references /boot/firmware/cmdline.txt instead of /boot/cmdline.txt.
  4. Ensuring the updated path aligns with the Raspberry Pi documentation for the /boot/firmware/ directory.

Testing

This change is a minor text update to an error message and does not affect the core functionality of k3s. Existing integration tests for cgroup detection should suffice, as the change only modifies the displayed file path. No new tests are required, but manual verification on a Raspberry Pi running Bookworm can confirm the updated message appears as expected.

Linked Issues

None

User-Facing Change

Updated error message for memory cgroup detection to reference the correct `cmdline.txt` location (`/boot/firmware/cmdline.txt`) on Raspberry Pi running Raspberry Pi OS Bookworm or later.

Further Comments

This change corrects an outdated file path in the error message, addressing confusion for Raspberry Pi users on Bookworm or later, where boot configuration files moved to /boot/firmware/. The fix is straightforward, aligning the error message with the current Raspberry Pi OS filesystem. No alternative approaches were considered, as this directly resolves the issue.

@zachspar zachspar requested a review from a team as a code owner August 28, 2025 02:43
Copy link
Member

@brandond brandond left a comment

Choose a reason for hiding this comment

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

Please update the checksum file

@zachspar zachspar requested a review from brandond August 28, 2025 04:55
brandond
brandond previously approved these changes Aug 28, 2025
Copy link

codecov bot commented Aug 28, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 20.72%. Comparing base (14e9198) to head (fcada1d).
⚠️ Report is 6 commits behind head on master.

❗ There is a different number of reports uploaded between BASE (14e9198) and HEAD (fcada1d). Click for more details.

HEAD has 3 uploads less than BASE
Flag BASE (14e9198) HEAD (fcada1d)
unittests 4 2
e2etests 1 0
Additional details and impacted files
@@             Coverage Diff             @@
##           master   #12842       +/-   ##
===========================================
- Coverage   40.90%   20.72%   -20.19%     
===========================================
  Files         187      185        -2     
  Lines       19067    19014       -53     
===========================================
- Hits         7799     3940     -3859     
- Misses      10088    14636     +4548     
+ Partials     1180      438      -742     
Flag Coverage Δ
e2etests ?
unittests 20.72% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

manuelbuil
manuelbuil previously approved these changes Aug 28, 2025
@zachspar
Copy link
Contributor Author

I believe there's a flaky test 😅

Updated SHA256 checksum for install.sh

Signed-off-by: Zachary Spar <[email protected]>
@dereknola dereknola dismissed stale reviews from manuelbuil and brandond via fcada1d September 18, 2025 23:32
@dereknola dereknola force-pushed the spar/install-error-msg branch from 808e676 to fcada1d Compare September 18, 2025 23:32
@dereknola dereknola merged commit 908a0b9 into k3s-io:master Sep 19, 2025
61 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.

4 participants