public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/btrfs: handle new checksum types in initrd 

Can't mount a root formatted with those otherwise

(cherry picked from commit e85f2f43bda6e0fe245005b710091f854a7f0200)
This commit is contained in:
Atemu 2021-06-08 06:23:27 +02:00 committed by github-actions[bot]
parent d3ebf03151
commit 95fc4eb09d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/tasks/filesystems/btrfs.nix
View File

@ -55,7 +55,16 @@ in
(mkIf enableBtrfs { (mkIf enableBtrfs {
system.fsPackages = [ pkgs.btrfs-progs ]; system.fsPackages = [ pkgs.btrfs-progs ];
boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ];
boot.initrd.availableKernelModules = mkIf inInitrd (
[ "crc32c" ]
++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [
# Needed for mounting filesystems with new checksums
"xxhash_generic"
"blake2b_generic"
"sha256_generic" # Should be baked into our kernel, just to be sure
]
);
boot.initrd.extraUtilsCommands = mkIf inInitrd boot.initrd.extraUtilsCommands = mkIf inInitrd
'' ''