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

Merge pull request #290061 from SuperSandro2000/kernel-modules-package-name 

nixos/boot: move name overwrite to pkgs.aggregateModules to option
parents 9a747326 191e258e

nixos/modules/system/boot/kernel.nix

+3 −1
Original line number Diff line number Diff line
@@ -233,7 +233,9 @@ in 
        symlinks because modprobe only supports one directory.

      '';

      # Convert the list of path to only one path.

      apply = pkgs.aggregateModules;

      apply = let

        kernel-name = config.boot.kernelPackages.kernel.name or "kernel";

      in modules: (pkgs.aggregateModules modules).override { name = kernel-name + "-modules"; };

    };



    system.requiredKernelConfig = mkOption {

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

+2 −6
Original line number Diff line number Diff line
@@ -13,15 +13,11 @@ let 


  kernel-name = config.boot.kernelPackages.kernel.name or "kernel";



  modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };

  firmware = config.hardware.firmware;





  # Determine the set of modules that we need to mount the root FS.

  modulesClosure = pkgs.makeModulesClosure {

    rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;

    kernel = modulesTree;

    firmware = firmware;

    kernel = config.system.modulesTree;

    firmware = config.hardware.firmware;

    allowMissing = false;

  };

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

+2 −4
Original line number Diff line number Diff line
@@ -91,13 +91,11 @@ let 
  };



  kernel-name = config.boot.kernelPackages.kernel.name or "kernel";

  modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };

  firmware = config.hardware.firmware;

  # Determine the set of modules that we need to mount the root FS.

  modulesClosure = pkgs.makeModulesClosure {

    rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;

    kernel = modulesTree;

    firmware = firmware;

    kernel = config.system.modulesTree;

    firmware = config.hardware.firmware;

    allowMissing = false;

  };