Unverified Commit 413f779b authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

nixos/udev: don't create modprobe config if modprobe is disabled

parent 9b1984ce

nixos/modules/services/hardware/udev.nix

+12 −12
Original line number Diff line number Diff line
@@ -401,8 +401,7 @@ in 
      }))

    ];



    environment.etc =

      {

    environment.etc = {

      "udev/rules.d".source = udevRulesFor {

        name = "udev-rules";

        udevPackages = cfg.packages;
@@ -411,6 +410,9 @@ in 
        inherit udevPath udev;

      };

      "udev/hwdb.bin".source = hwdbBin;

    } // lib.optionalAttrs config.boot.modprobeConfig.enable {

      # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.

      "modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware";

    };



    system.requiredKernelConfig = with config.lib.kernelConfig; [
@@ -419,8 +421,6 @@ in 
      (isYes "NET")

    ];



    # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.

    environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware";



    system.activationScripts.udevd =

      ''