Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bcachefs-tools: patch to fix unlocking encrypted fs at boot with bcachefs-tools-1.7.0 #310504

Merged
merged 1 commit into from
May 11, 2024

Conversation

reedriley
Copy link
Contributor

Fixes #309388

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from davidak, Madouura and JohnRTitor May 10, 2024 05:08
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 10, 2024
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

PR title should be "Patch to fix boot with encrypted root".

Result of nixpkgs-review pr 310504 run on x86_64-linux 1

1 package built:
  • bcachefs-tools

@reedriley reedriley force-pushed the bcachefs-tools-fix branch from c32340a to 20362ae Compare May 10, 2024 13:52
@reedriley reedriley changed the title bcachefs-tools: patch to fix boot with bcachefs-tools-1.7.0 bcachefs-tools: patch to fix unlocking encrypted fs at boot with bcachefs-tools-1.7.0 May 10, 2024
@reedriley
Copy link
Contributor Author

reedriley commented May 10, 2024

PR title should be "Patch to fix boot with encrypted root".

Nit? It's not restricted to the root fs - seems to be any unlocked at boot.

@ofborg ofborg bot requested a review from JohnRTitor May 10, 2024 14:19
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

Good to go.

@JohnRTitor JohnRTitor added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels May 10, 2024
@JohnRTitor JohnRTitor requested a review from onny May 11, 2024 03:57
@onny
Copy link
Contributor

onny commented May 11, 2024

Result of nixpkgs-review pr 310504 run on x86_64-linux 1

1 package built:
  • bcachefs-tools

@onny
Copy link
Contributor

onny commented May 11, 2024

Result of nixpkgs-review pr 310504 run on x86_64-linux 1

1 test built:
  • nixosTests.bcachefs

@onny onny merged commit 86966b6 into NixOS:master May 11, 2024
28 checks passed
@onny
Copy link
Contributor

onny commented May 11, 2024

Thank you!

@reedriley reedriley deleted the bcachefs-tools-fix branch May 11, 2024 09:01
@pimeys
Copy link
Contributor

pimeys commented May 13, 2024

Thank you. Tested this out today and it fixes the issue for me.

@JohnRTitor
Copy link
Contributor

JohnRTitor commented May 14, 2024

@reedriley recent kernel update to 6.9 broke this on unencrypted systems as well, including my own system.

As this patch was not working on bcachefs-tools master, I suspect this is because of that.

The upstream PR (koverstreet/bcachefs-tools#263) since then have been updated, and I would very much be supportive of testing it yourself and updating the patch on Nixpkgs. Ideally, the patch needs to be accepted on upstream first.

I had to run fsck from a NixOS ISO to fix this and then rebuild from there.

@reedriley
Copy link
Contributor Author

@JohnRTitor I think I just hit the same breakage on upgrading myself...

But unless I'm mistaken bcachefs-tools builds off a tag where this patch does work, and that hasn't changed? And I upgraded from 6.9-rc6 to 6.9.1 which shouldn't have changed interactions here significantly? (In short - I'm confused. If I have time this weekend I'll see what happens if I revert my system's kernel to see if that helps...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

booting with bcachefs compression on is broken
4 participants