bcachefs: fix subvolume mounting#1058
Conversation
|
Please don’t change the Nixpkgs input to your own fork, you’ll need to wait till it gets merged upstream |
|
That PR got merged 🎉 |
|
https://nixpkgs-tracker.ocfox.me/?pr=414391 Currently only on master, not nixpkgs-unstable yet |
|
It's in every channel now 🎉 |
|
@nothingnesses can you rebase this PR? |
nothingnesses
force-pushed
the
nix-community/disko#1045
branch
4 times, most recently
from
6fe546d to
d6d6c38
Compare
tests/bcachefs.nix
Outdated
| extraModulePackages = [ | ||
| (config.boot.kernelPackages.callPackage pkgs.bcachefs-tools.kernelModule {}) | ||
| ]; | ||
| # Can also use the following instead of the above, | ||
| # which doesn't necessitate passing in `config`, | ||
| # so `{ config, ... }: ` can be removed: | ||
| # supportedFilesystems = [ "bcachefs" ]; |
There was a problem hiding this comment.
Using supportedFilesystems sounds good, maybe you can see if this also adds bcachefs-tools to environment.systemPackages
|
Looks like the disko-install test failed when it timed out trying to download this patch. Can someone restart it please? |
|
I ran it again but it's failing to download the patch inside the VM test which means there's a dependency missing from: disko/tests/disko-install/default.nix Lines 9 to 19 in 163dbfb |
|
@Enzime I pushed a commit to add a dependency and it looks like the test passes now. |
|
@Enzime Just wondering what the status is on this. Is there anything else I need to do on my end? |
|
I’ve been using this PR successfully with my new config and would like to see this merged. |
tests/bcachefs.nix
Outdated
| ''; | ||
| }; | ||
| in | ||
| pkgs.lib.attrsets.recursiveUpdate diskoTest { |
There was a problem hiding this comment.
Instead of using recursiveUpdate you can pass the relevant NixOS configuration through as an arg to makeDiskoTest using either extraSystemConfig or extraInstallerConfig
tests/bcachefs.nix
Outdated
| # Test that verbose option was set for "/". | ||
| machine.succeed(""" | ||
| findmnt --json \ | ||
| findmnt -J \ |
There was a problem hiding this comment.
I would leave all of these as --json as it's a lot more clear than -J
tests/bcachefs.nix
Outdated
| extraModulePackages = [ | ||
| (config.boot.kernelPackages.callPackage pkgs.bcachefs-tools.kernelModule {}) | ||
| ]; | ||
| # Can also use the following instead of the above, | ||
| # which doesn't necessitate passing in `config`, | ||
| # so `{ config, ... }: ` can be removed: | ||
| # supportedFilesystems = [ "bcachefs" ]; |
There was a problem hiding this comment.
Using supportedFilesystems sounds good, maybe you can see if this also adds bcachefs-tools to environment.systemPackages
|
@Enzime Thanks for the review! I've pushed more commits to address the points you made. Please let me know if you think there's any other changes needed. |
Enzime
force-pushed
the
nix-community/disko#1045
branch
from
7bd56a2 to
1e95379
Compare
|
Thanks :) |
4 participants
This fixes #1045 and updates the bcachefs test to handle the changes made. It also replaces
nixpkgswith a version from this PR. This part will need to be reverted, once the changes from that version gets merged upstream.