diff options
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0cfef7df1972..fd6523c0ece4 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -9,7 +9,8 @@ let efi = config.boot.loader.efi; realGrub = if cfg.version == 1 then pkgs.grub - else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; }; + else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; } + else pkgs.grub2; grub = # Don't include GRUB if we're only generating a GRUB menu (e.g., @@ -21,7 +22,7 @@ let grubEfi = # EFI version of Grub v2 if (cfg.devices != ["nodev"]) && cfg.efiSupport && (cfg.version == 2) - then pkgs.grub2.override { zfsSupport = cfg.zfsSupport; efiSupport = cfg.efiSupport; } + then realGrub.override { efiSupport = cfg.efiSupport; } else null; f = x: if x == null then "" else "" + x; |