From 482228919c80d283130e30afa2bfdee05a5bfb92 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 3 Nov 2018 12:34:35 +0100 Subject: [PATCH] nixos/bcachefs: remove superfluous fsck from initrd bcachefs checks the filesystem at mount time, therefore no separate fsck binary is needed in initrd. --- nixos/modules/system/boot/stage-1-init.sh | 5 +---- nixos/modules/tasks/filesystems/bcachefs.nix | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 3bc33a20a09f..6a4ac8128ab3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -246,10 +246,7 @@ checkFS() { if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi # Don't check resilient COWs as they validate the fs structures at mount time - if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi - - # Skip fsck for bcachefs - not implemented yet. - if [ "$fsType" = bcachefs ]; then return 0; fi + if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 227707173a3d..dfb8106d9a5e 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -17,10 +17,5 @@ in boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; boot.initrd.availableKernelModules = mkIf inInitrd [ "bcachefs" ]; - boot.initrd.extraUtilsCommands = mkIf inInitrd - '' - copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/fsck.bcachefs - ''; - }; }