From da787e307140b4f4144f592d16e3a2dfbfd40cf1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 8 Aug 2012 23:02:46 -0400 Subject: [PATCH] efi-boot-stub: List required kernel config --- .../system/boot/loader/efi-boot-stub/efi-boot-stub.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix index a4e0ebd9845..099cdefe142 100644 --- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix +++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix @@ -113,6 +113,7 @@ let platform = pkgs.stdenv.platform; in { + assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ]; require = [ options @@ -120,11 +121,13 @@ in # ../system/system-options.nix ]; - system = mkIf (config.boot.loader.efiBootStub.enable && (assert - (config.boot.kernelPackages.kernel.features ? efiBootStub && - config.boot.kernelPackages.kernel.features.efiBootStub); true)) { + system = { build.installBootLoader = efiBootStubBuilder; boot.loader.id = "efiBootStub"; boot.loader.kernelFile = platform.kernelTarget; + requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "EFI_STUB") + ]; }; + }