diff options
| author | Hedtke, Moritz <Moritz.Hedtke@t-online.de> | 2021-03-20 23:56:32 +0100 |
|---|---|---|
| committer | Hedtke, Moritz <Moritz.Hedtke@t-online.de> | 2021-03-20 23:57:50 +0100 |
| commit | 742f3a43692e9c4e5a65c8cdd97344bae2c90451 (patch) | |
| tree | 025b5302140a0f0fafea0ea83f3ee4f150d198d4 /nixos/modules/tasks/filesystems/zfs.nix | |
| parent | 2a41d14475171ff66efa053bc30f1233052c0499 (diff) | |
| download | nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar.gz nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar.bz2 nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar.lz nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar.xz nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.tar.zst nixpkgs-742f3a43692e9c4e5a65c8cdd97344bae2c90451.zip | |
nixos/zfs: Fix regression that prevents people to boot from zfs using grub if they didn't add zfs to boot.initrd.supportedFilesystems
See https://github.com/NixOS/nixpkgs/pull/99386
Diffstat (limited to 'nixos/modules/tasks/filesystems/zfs.nix')
| -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 59676e99678..aa18d9a788b 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; }; |