movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/systemd-initrd: add missing kmod-blacklist src (#348505)

Browse source
This commit is contained in:
Will Fancher 2024-10-17 15:46:51 -04:00 • committed by GitHub
commit 594ac9011f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/system/boot/stage-1.nix
View file

@ -349,13 +349,7 @@ let
{ object = "${modulesClosure}/lib"; { object = "${modulesClosure}/lib";
symlink = "/lib"; symlink = "/lib";
} }
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { { object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
preferLocalBuild = true;
} ''
target=$out
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
'';
symlink = "/etc/modprobe.d/ubuntu.conf"; symlink = "/etc/modprobe.d/ubuntu.conf";
} }
{ object = config.environment.etc."modprobe.d/nixos.conf".source; { object = config.environment.etc."modprobe.d/nixos.conf".source;

4
nixos/modules/system/boot/systemd/initrd.nix
View file

@ -437,9 +437,7 @@ in {
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
"/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } '' "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
'';
"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
"/etc/os-release".source = config.boot.initrd.osRelease; "/etc/os-release".source = config.boot.initrd.osRelease;