diff options
author | Linus Heckemann <git@sphalerite.org> | 2020-12-04 18:37:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-04 18:37:50 +0100 |
commit | c14f14eeaf919c914e4dec2ce485a5bdc8dd4fec (patch) | |
tree | 02e7a8240820e33266e45df7134e0d8493ee735e /nixos/modules | |
parent | 29566ca0219041547322cefac408435a18a023b1 (diff) | |
parent | fdd944526ccbf2229df70bb7fa1538649642887c (diff) |
Merge pull request #97505 from mayflower/grub-efi-mirroredboot
nixos/grub: allow multiple "nodev" devices for mirroredBoots
Diffstat (limited to 'nixos/modules')
-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 09f7641dc9d9..df5dfaa554bc 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -741,7 +741,7 @@ in + "'boot.loader.grub.mirroredBoots' to make the system bootable."; } { - assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); + assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters); message = "You cannot have duplicated devices in mirroredBoots"; } { |