alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/bcachefs: fix boot with systemd enabled initrd

Browse source
This commit is contained in:
Jörg Thalheim 2022-12-29 23:17:27 +01:00
parent 1e6cf6f3dc
commit 655e072533
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nixos/modules/tasks/filesystems/bcachefs.nix
View file

@ -42,7 +42,11 @@ in
{ {
config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [
{ {
system.fsPackages = [ pkgs.bcachefs-tools ]; # We do not want to include bachefs in the fsPackages for systemd-initrd
# because we provide the unwrapped version of mount.bcachefs
# through the extraBin option, which will make it available for use.
system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
# use kernel package with bcachefs support until it's in mainline # use kernel package with bcachefs support until it's in mainline
boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
@ -52,7 +56,14 @@ in
# chacha20 and poly1305 are required only for decryption attempts # chacha20 and poly1305 are required only for decryption attempts
boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];
boot.initrd.extraUtilsCommands = '' boot.initrd.systemd.extraBin = {
"bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
"mount.bcachefs" = pkgs.runCommand "mount.bcachefs" {} ''
cp -pdv ${pkgs.bcachefs-tools}/bin/.mount.bcachefs.sh-wrapped $out
'';
};
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
''; '';
boot.initrd.extraUtilsCommandsTest = '' boot.initrd.extraUtilsCommandsTest = ''