summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-25 23:03:24 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-25 23:03:31 -0700
commitb07d2a447b3a95bba0887c360353eac68f156aa4 (patch)
tree983384ab788f1ac98b05f950a7d16f7631194a76 /nixos
parent4128b474f4fabca1f389971cf321e07f466f10c6 (diff)
downloadnixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar.gz
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar.bz2
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar.lz
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar.xz
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.tar.zst
nixpkgs-b07d2a447b3a95bba0887c360353eac68f156aa4.zip
nixos/grub: Fix assertion
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix2
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 e64c41b7f48..c790e05f51b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -394,7 +394,7 @@ in
           message = "Boot paths must be absolute, not ${args.path}";
         }
         {
-          assertion = hasPrefix "/" args.efiSysMountPoint;
+          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: {