diff options
| author | Luflosi <luflosi@luflosi.de> | 2021-11-07 20:49:45 +0100 |
|---|---|---|
| committer | Luflosi <luflosi@luflosi.de> | 2022-01-24 22:56:14 +0100 |
| commit | 1c58cdbeed880e99d816c234a954d4cdfc073b6c (patch) | |
| tree | dc7ce1d03b4305ce425959d71b26baab038b57c6 /nixos/modules/system/boot/stage-1.nix | |
| parent | 68eafd0937d33eda3a88389345da6bb32f2a6d3b (diff) | |
| download | nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar.gz nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar.bz2 nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar.lz nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar.xz nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.tar.zst nixpkgs-1c58cdbeed880e99d816c234a954d4cdfc073b6c.zip | |
nixos/modprobe: add boot.initrd.extraModprobeConfig option
This option behaves exactly like `boot.extraModprobeConfig`, except that it also includes the generated modprobe.d file in the initrd. Many years ago, someone tried to include the normal modprobe.d/nixos.conf file generated by `boot.extraModprobeConfig` in the initrd: 0aa2c1dc46779a3df6c4e02d3fae39b0de297be8. This file contains a reference to a directory with firmware files inside. Including firmware in the initrd made it too big, so the commit was reverted again in 4a4c051a95b6b8da3a13d7955087e915e6dd4bf7. The `boot.extraModprobeConfig` option not changing the initrd caused me much confusion because I tried to set the maximum cache size for ZFS and it didn't work. Closes https://github.com/NixOS/nixpkgs/issues/25456.
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6dfe6b939ab..9c684fbada2 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -338,6 +338,9 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } + { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source; + symlink = "/etc/modprobe.d/nixos-initrd.conf"; + } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; preferLocalBuild = true; |