From b89a65e54cf1742f37db6d24f7c8a7dd1e930be7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2012 03:20:12 +0000 Subject: [PATCH] Allow multiple definitions of boot.loader.kernelFile as long as they are all the same svn path=/nixos/trunk/; revision=33139 --- modules/system/activation/top-level.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix index 265f06a5a9d..aa79fb3698d 100644 --- a/modules/system/activation/top-level.nix +++ b/modules/system/activation/top-level.nix @@ -38,6 +38,9 @@ let description = '' Name of the kernel file to be passed to the bootloader. ''; + merge = kernelFiles: + builtins.head (map (f: assert f == builtins.head kernelFiles; f) + kernelFiles); }; system.copySystemConfiguration = pkgs.lib.mkOption {