summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-03-16 03:20:12 +0000
committerShea Levy <shea@shealevy.com>2012-03-16 03:20:12 +0000
commitb89a65e54cf1742f37db6d24f7c8a7dd1e930be7 (patch)
tree056297e9cf6b95893c0db06051b5a68d3a7a12c3
parent1bccbc30cd526deac4eaf10e0f0a7e7389eda009 (diff)
downloadnixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar.gz
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar.bz2
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar.lz
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar.xz
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.tar.zst
nixpkgs-b89a65e54cf1742f37db6d24f7c8a7dd1e930be7.zip
Allow multiple definitions of boot.loader.kernelFile as long as they are all the same
svn path=/nixos/trunk/; revision=33139
-rw-r--r--modules/system/activation/top-level.nix3
1 files changed, 3 insertions, 0 deletions
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 {