public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub: Don't remove zfs support if contained in the default binary

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-13 14:40:41 -08:00
parent 69a277e2cc
commit 1fddcd1e83
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -9,7 +9,8 @@ let
efi = config.boot.loader.efi; efi = config.boot.loader.efi;
realGrub = if cfg.version == 1 then pkgs.grub 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 = grub =
# Don't include GRUB if we're only generating a GRUB menu (e.g., # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@ -21,7 +22,7 @@ let
grubEfi = grubEfi =
# EFI version of Grub v2 # EFI version of Grub v2
if (cfg.devices != ["nodev"]) && cfg.efiSupport && (cfg.version == 2) 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; else null;
f = x: if x == null then "" else "" + x; f = x: if x == null then "" else "" + x;