summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorLuflosi <luflosi@luflosi.de>2022-03-16 14:47:45 +0100
committerLuflosi <luflosi@luflosi.de>2022-03-17 12:56:02 +0100
commit47b699fe6c417b77575eff93be4b21a8530cf9be (patch)
tree35afd67aa5b434084fd5512eb123f38c4e71fa26 /nixos/doc/manual
parent5855ff74f511423e3e2646248598b3ffff229223 (diff)
downloadnixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar.gz
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar.bz2
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar.lz
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar.xz
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.tar.zst
nixpkgs-47b699fe6c417b77575eff93be4b21a8530cf9be.zip
Revert "nixos/modprobe: add boot.initrd.extraModprobeConfig option"
This reverts commit 1c58cdbeed880e99d816c234a954d4cdfc073b6c, since this change was made redundant by 3dc6fab5c9362db2cf079ffa15f2b62b05001747 and in https://github.com/NixOS/nixpkgs/pull/145013 we decided to revert this commit.
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md2
2 files changed, 0 insertions, 10 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index d91bad8042d..cb88db67235 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1319,14 +1319,6 @@
       </listitem>
       <listitem>
         <para>
-          A new option
-          <literal>boot.initrd.extraModprobeConfig</literal> has been
-          added which can be used to configure kernel modules that are
-          loaded in the initrd.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <literal>nixos-generate-config</literal> now puts the dhcp
           configuration in <literal>hardware-configuration.nix</literal>
           instead of <literal>configuration.nix</literal>.
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 2e01297f15f..27cca7158e0 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -491,8 +491,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
 
-- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
-
 - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
 
 - ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: