From 1bccbc30cd526deac4eaf10e0f0a7e7389eda009 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2012 02:55:17 +0000 Subject: [PATCH] efiBootStub: Assert that the kernel has the efiBootStub feature svn path=/nixos/trunk/; revision=33138 --- modules/installer/efi-boot-stub/efi-boot-stub.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix index c83ba8937b6..55c4055ca1e 100644 --- a/modules/installer/efi-boot-stub/efi-boot-stub.nix +++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix @@ -108,7 +108,9 @@ in # ../system/system-options.nix ]; - system = mkIf config.boot.loader.efiBootStub.enable { + system = mkIf (config.boot.loader.efiBootStub.enable && (assert + (config.boot.kernelPackages.kernel.features ? efiBootStub && + config.boot.kernelPackages.kernel.features.efiBootStub); true)) { build = { menuBuilder = efiBootStubBuilder; };