diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-11 11:40:48 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-11 11:42:41 +0200 |
| commit | 88f10ad40950d3134de0301cd226d768d765fd00 (patch) | |
| tree | ed1194ec9fb01d23d1cea8fd3d2854c93a3f31b2 /pkgs/os-specific/linux/kmod | |
| parent | ecb596b898bcf3992ab3b90fa0b301153801f810 (diff) | |
| download | nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar.gz nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar.bz2 nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar.lz nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar.xz nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.tar.zst nixpkgs-88f10ad40950d3134de0301cd226d768d765fd00.zip | |
aggregateModules: Preserve kernel's modules.{builtin,order}
Fixes #19426.
Diffstat (limited to 'pkgs/os-specific/linux/kmod')
| -rw-r--r-- | pkgs/os-specific/linux/kmod/aggregator.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 88069ba4bf1..9bd7c8480c1 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -17,10 +17,12 @@ buildEnv { echo "kernel version is $kernelVersion" + shopt -s extglob + # Regenerate the depmod map files. Be sure to pass an explicit # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then - rm -f $out/lib/modules/$kernelVersion/modules.* + rm -f $out/lib/modules/$kernelVersion/modules.!(builtin*|order*) ${kmod}/bin/depmod -b $out -a $kernelVersion fi ''; |