colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
nixos/boot: move name overwrite to pkgs.aggregateModules to option
This commit is contained in:
Will Fancher 2024-03-19 13:04:19 -04:00 committed by GitHub
commit f0701b576a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/kernel.nix
View File

@ -233,7 +233,9 @@ in
symlinks because modprobe only supports one directory. symlinks because modprobe only supports one directory.
''; '';
# Convert the list of path to only one path. # 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 { system.requiredKernelConfig = mkOption {

8
nixos/modules/system/boot/stage-1.nix
View File

@ -13,15 +13,11 @@ let
kernel-name = config.boot.kernelPackages.kernel.name or "kernel"; 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. # Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure { modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules; rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree; kernel = config.system.modulesTree;
firmware = firmware; firmware = config.hardware.firmware;
allowMissing = false; allowMissing = false;
}; };

6
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -91,13 +91,11 @@ let
}; };
kernel-name = config.boot.kernelPackages.kernel.name or "kernel"; 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. # Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure { modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules; rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree; kernel = config.system.modulesTree;
firmware = firmware; firmware = config.hardware.firmware;
allowMissing = false; allowMissing = false;
}; };