diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-20 07:47:06 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-20 07:47:06 -0500 |
| commit | 2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c (patch) | |
| tree | df09e3d2961d276399afb18377572d8981a4aa07 /nixos | |
| parent | 9e4166328cb7128552739f56bb40328ebbe77b23 (diff) | |
| parent | c61ff9b51edb2c282124c45d4fae0645e137f145 (diff) | |
| download | nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar.gz nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar.bz2 nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar.lz nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar.xz nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.tar.zst nixpkgs-2fe3a3c203ddabbfa2e67ada33fcbc903c1d814c.zip | |
Merge branch 'grub' of git://github.com/ts468/nixpkgs
Fix grubTarget on nodev installs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index fd6523c0ece..a166709d39a 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -34,7 +34,7 @@ let shell = "${pkgs.stdenv.shell}"; fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; - grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f grubEfi.grubTarget else ""; + grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; inherit (efi) efiSysMountPoint canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries |