Commit 71c64f8e authored Oct 17, 2024 by Paul Meyer

initrd: drop effectless modification of kmod-blacklist

The perl snippet as been added years ago. I assume the intention was to
remove the `## file: iwlwifi.conf` section up to the next `## file:`,
but as there is no file following, the snippet currently does nothing.
We should be fine to remove it.

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>

parent 2f6e0c8d

nixos/modules/system/boot/stage-1.nix

+1 −7

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

nixos/modules/system/boot/systemd/initrd.nix

+1 −6

Original line number	Diff line number	Diff line
		@@ -448,12 +448,7 @@ in {

		"/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/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
		src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
		preferLocalBuild = true;
		} ''
		${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
		'';
		"/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
		"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;

		"/etc/os-release".source = config.boot.initrd.osRelease;