From 459cb7d1c8307cf6acfed3f300ba617125b99f53 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 21 Oct 2023 13:40:12 -0500 Subject: [PATCH] nixos/kernel: correct kernelPatches.extraConfig documentation It hasn't expected the prefix for a long time (possibly ever). Other documentation and patches within nixpkgs itself (such as the crashdump module) do not have the prefix. (cherry picked from commit be8065759e222f80085c99a14f630add97419f17) --- nixos/modules/system/boot/kernel.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 0298e28f3289..56f86cffd6ef 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -96,8 +96,8 @@ in # (required, but can be null if only config changes # are needed) - extraStructuredConfig = { # attrset of extra configuration parameters - FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional) + extraStructuredConfig = { # attrset of extra configuration parameters without the CONFIG_ prefix + FOO = lib.kernel.yes; # (optional) }; # values should generally be lib.kernel.yes, # lib.kernel.no or lib.kernel.module @@ -105,8 +105,9 @@ in foo = true; # (may be checked by other NixOS modules, optional) }; - extraConfig = "CONFIG_FOO y"; # extra configuration options in string form - # (deprecated, use extraStructuredConfig instead, optional) + extraConfig = "FOO y"; # extra configuration options in string form without the CONFIG_ prefix + # (optional, multiple lines allowed to specify multiple options) + # (deprecated, use extraStructuredConfig instead) } ```