diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-04-17 16:01:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 16:01:22 +0100 |
| commit | fc02b147382728d2cc373bf7d859e8d1da25eb38 (patch) | |
| tree | 743f4c5464132b10b4aefc6ab6e55b970650d220 | |
| parent | ae5d8cd17bb320226644d927c857cc8da66b02e4 (diff) | |
| parent | 742f3a43692e9c4e5a65c8cdd97344bae2c90451 (diff) | |
| download | nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar.gz nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar.bz2 nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar.lz nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar.xz nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.tar.zst nixpkgs-fc02b147382728d2cc373bf7d859e8d1da25eb38.zip | |
Merge pull request #117071 from mohe2015/hotfix-zfs-grub
nixos/zfs: Fix regression that prevents people to boot from zfs using grub if they didn't add zfs to boot.initrd.supportedFilesystems
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 97fab6f11ea..21c30305188 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -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; }; |