git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #164584 from Luflosi/revert-one-of-two-similar-prs

Revert one of two similar prs

commitf998110c6d6cf8d78a826df5efc34a467ef1f9b0 authorJörg Thalheim <Mic92@users.noreply.github.com> dateThu 17 Mar 2022, 15:35 (5 years ago) parent3295dd47867b95
4 files changed+5−28
compare with master
unifiedsplit
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+4−4 nixos/doc/manual/release-notes/rl-2205.section.md+1−1 nixos/modules/system/boot/modprobe.nix−20 nixos/modules/system/boot/stage-1.nix−3
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+4−4
@@ -1319,10 +1319,10 @@
13191319 </listitem>
13201320 <listitem>
13211321 <para>
1322− A new option
1323− <literal>boot.initrd.extraModprobeConfig</literal> has been
1324− added which can be used to configure kernel modules that are
1325− loaded in the initrd.
1322+ The options <literal>boot.extraModprobeConfig</literal> and
1323+ <literal>boot.blacklistedKernelModules</literal> now also take
1324+ effect in the initrd by copying the file
1325+ <literal>/etc/modprobe.d/nixos.conf</literal> into the initrd.
13261326 </para>
13271327 </listitem>
13281328 <listitem>
nixos/doc/manual/release-notes/rl-2205.section.md+1−1
@@ -491,7 +491,7 @@ In addition to numerous new and upgraded packages, this release has the followin
491491
492492- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
493493
494−- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
494+- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
495495
496496- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
497497
nixos/modules/system/boot/modprobe.nix−20
@@ -34,23 +34,6 @@ with lib;
3434 type = types.lines;
3535 };
3636
37− boot.initrd.extraModprobeConfig = mkOption {
38− default = "";
39− example =
40− ''
41− options zfs zfs_arc_max=1073741824
42− '';
43− description = ''
44− Does exactly the same thing as
45− <option>boot.extraModprobeConfig</option>, except
46− that the generated <filename>modprobe.conf</filename>
47− file is also included in the initrd.
48− This is useful for setting module options for kernel
49− modules that are loaded during early boot in the initrd.
50− '';
51− type = types.lines;
52− };
53−
5437 };
5538
5639
@@ -67,9 +50,6 @@ with lib;
6750 '')}
6851 ${config.boot.extraModprobeConfig}
6952 '';
70− environment.etc."modprobe.d/nixos-initrd.conf".text = ''
71− ${config.boot.initrd.extraModprobeConfig}
72− '';
7353 environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
7454
7555 environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";
nixos/modules/system/boot/stage-1.nix−3
@@ -338,9 +338,6 @@ let
338338 { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
339339 symlink = "/etc/mdadm.conf";
340340 }
341− { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source;
342− symlink = "/etc/modprobe.d/nixos-initrd.conf";
343− }
344341 { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
345342 src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
346343 preferLocalBuild = true;