diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-02-07 12:33:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 12:33:51 +0100 |
| commit | 237d5fa67a67c91d873eb756dcbb25b33423f57d (patch) | |
| tree | aca799acf0b0ce31f2b733b6a5a030fee0ef15de /nixos/modules | |
| parent | d7f6cb105704068eae49a048a11030f849fdf44a (diff) | |
| parent | 2c769d7a6a332bd03b07e8ebd16d8e5bd664222f (diff) | |
Merge pull request #111452 from urbas/linuxPackages_rpi3-missing-ahci-module
system/boot: add includeDefaultModules option
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ed7226331d70e..363d8e47a0ff1 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -156,6 +156,16 @@ in description = "List of modules that are always loaded by the initrd."; }; + boot.initrd.includeDefaultModules = mkOption { + type = types.bool; + default = true; + description = '' + This option, if set, adds a collection of default kernel modules + to <option>boot.initrd.availableKernelModules</option> and + <option>boot.initrd.kernelModules</option>. + ''; + }; + system.modulesTree = mkOption { type = types.listOf types.path; internal = true; @@ -195,7 +205,8 @@ in config = mkMerge [ (mkIf config.boot.initrd.enable { boot.initrd.availableKernelModules = - [ # Note: most of these (especially the SATA/PATA modules) + optionals config.boot.initrd.includeDefaultModules ([ + # Note: most of these (especially the SATA/PATA modules) # shouldn't be included by default since nixos-generate-config # detects them, but I'm keeping them for now for backwards # compatibility. @@ -235,10 +246,11 @@ in # x86 RTC needed by the stage 2 init script. "rtc_cmos" - ]; + ]); boot.initrd.kernelModules = - [ # For LVM. + optionals config.boot.initrd.includeDefaultModules [ + # For LVM. "dm_mod" ]; }) |