Unverified Commit 594ac901 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

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

parents cd286b21 71c64f8e

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 −3
Original line number Diff line number Diff line
@@ -437,9 +437,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" { } ''

          ${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;