diff options
| author | Luflosi <luflosi@luflosi.de> | 2022-03-16 14:47:45 +0100 |
|---|---|---|
| committer | Luflosi <luflosi@luflosi.de> | 2022-03-17 12:56:02 +0100 |
| commit | 47b699fe6c417b77575eff93be4b21a8530cf9be (patch) | |
| tree | 35afd67aa5b434084fd5512eb123f38c4e71fa26 /nixos/modules | |
| parent | 5855ff74f511423e3e2646248598b3ffff229223 (diff) | |
| download | nixpkgs-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/modules')
| -rw-r--r-- | nixos/modules/system/boot/modprobe.nix | 20 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 3 |
2 files changed, 0 insertions, 23 deletions
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 27f78835adb..e683d181729 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -34,23 +34,6 @@ with lib; type = types.lines; }; - boot.initrd.extraModprobeConfig = mkOption { - default = ""; - example = - '' - options zfs zfs_arc_max=1073741824 - ''; - description = '' - Does exactly the same thing as - <option>boot.extraModprobeConfig</option>, except - that the generated <filename>modprobe.conf</filename> - file is also included in the initrd. - This is useful for setting module options for kernel - modules that are loaded during early boot in the initrd. - ''; - type = types.lines; - }; - }; @@ -67,9 +50,6 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; - environment.etc."modprobe.d/nixos-initrd.conf".text = '' - ${config.boot.initrd.extraModprobeConfig} - ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index a85a3675e03..8b011d91563 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -338,9 +338,6 @@ 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; |