diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2023-11-14 22:40:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-14 22:40:04 -0500 |
commit | 3d88cc85dd12a695cd029b2f907ef609d7c25c68 (patch) | |
tree | 655e64e991d686d6c207d13bd671e2b506ab7fcf | |
parent | b04b7d64f7a344e6e20e0cd432838733751e6cab (diff) | |
parent | be8065759e222f80085c99a14f630add97419f17 (diff) | |
download | nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar.gz nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar.bz2 nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar.lz nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar.xz nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.tar.zst nixpkgs-3d88cc85dd12a695cd029b2f907ef609d7c25c68.zip |
Merge pull request #262595 from tpwrules/fix-extra-config-documentation
nixos/kernel: correct kernelPatches.extraConfig documentation
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 6b07686efcb..a46331ccd43 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) } ``` |