Unverified Commit 2fd3838e authored by Arian van Putten's avatar Arian van Putten Committed by GitHub
Browse files

nixos/systemd/initrd: fix modprobe (#512141)

parents 8bb5e2cb 7fed7a40

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

+4 −0
Original line number Diff line number Diff line
@@ -640,6 +640,10 @@ in 
          ) cfg.automounts

        );



      services."modprobe@" = lib.mkIf (config.system.build.kernel.config.isYes "MODULES") {

        serviceConfig.ExecSearchPath = lib.makeBinPath [ cfg.package.kmod ];

      };



      services.initrd-find-nixos-closure = lib.mkIf (!config.system.nixos-init.enable) {

        description = "Find NixOS closure";

nixos/tests/systemd-initrd-modprobe.nix

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 
    rtt = machine.succeed("cat /sys/module/tcp_hybla/parameters/rtt0")

    assert int(rtt) == 42, "Parameter should be respected for initrd kernel modules"



    with subtest("modprobe@ services work"):

      modprobe_service_status = machine.succeed("systemctl show --property ExecMainStatus modprobe@9pnet_virtio.service")

      t.assertEqual("ExecMainStatus=0\n", modprobe_service_status)



    # Make sure it sticks in stage 2

    machine.switch_root()

    machine.wait_for_unit("multi-user.target")