Skip to content

Commit

Permalink
nixos/zfs: Fix regression that prevents people to boot from zfs using…
Browse files Browse the repository at this point in the history
… grub if they didn't add zfs to boot.initrd.supportedFilesystems

See NixOS#99386
  • Loading branch information
mohe2015 committed Mar 20, 2021
1 parent 2a41d14 commit 742f3a4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nixos/modules/tasks/filesystems/zfs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ in
'') rootPools));
};

boot.loader.grub = mkIf inInitrd {
# TODO FIXME See https://github.com/NixOS/nixpkgs/pull/99386#issuecomment-798813567. To not break people's bootloader and as probably not everybody would read release notes that thoroughly add inSystem.
boot.loader.grub = mkIf (inInitrd || inSystem) {
zfsSupport = true;
};

Expand Down

0 comments on commit 742f3a4

Please sign in to comment.