diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /nixos/modules/system/boot/loader/grub/grub.nix | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
download | nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.gz nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.bz2 nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.lz nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.xz nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.zst nixlib-5061fe0c2c7743370e1d379d6fa60eed26ff1470.zip |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/system/boot/loader/grub/grub.nix')
-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 4c85bd5db4a8..4a68ae901dad 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -684,7 +684,7 @@ in assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint; message = "EFI paths must be absolute, not ${args.efiSysMountPoint}"; } - ] ++ flip map args.devices (device: { + ] ++ forEach args.devices (device: { assertion = device == "nodev" || hasPrefix "/" device; message = "GRUB devices must be absolute paths, not ${device} in ${args.path}"; })); |