ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117071 from mohe2015/hotfix-zfs-grub

Browse Source 
nixos/zfs: Fix regression that prevents people to boot from zfs using grub if they didn't add zfs to boot.initrd.supportedFilesystems
This commit is contained in:
Jörg Thalheim 2021-04-17 16:01:22 +01:00 committed by GitHub
commit fc02b14738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -446,7 +446,8 @@ in
'') rootPools)); '') 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; zfsSupport = true;
}; };