summary refs log tree commit diff
path: root/pkgs/os-specific/linux/busybox
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-06-08 11:59:56 +0000
committerAlyssa Ross <hi@alyssa.is>2021-10-13 17:30:25 +0000
commit7ff58e4a86d10d699fad1459c640ca87ede4a387 (patch)
tree71e8c2bca67df5cedd0bada7f3be4bee8e8bbea9 /pkgs/os-specific/linux/busybox
parente57c97d7920106bb06a2899d8d38858e937c0ec5 (diff)
downloadnixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar.gz
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar.bz2
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar.lz
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar.xz
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.tar.zst
nixpkgs-7ff58e4a86d10d699fad1459c640ca87ede4a387.zip
busybox: use more featureful modprobe by default
The default version (modprobe-small) is missing important features,
and can also be _extremely_ slow (on purpose[1]).

The non-small modprobe implementation doesn't have all features
enabled by default, so by changing implementation we'd be risking
regression.  To mitigate that, I've ensured every feature checked for
in modprobe.c is enabled.  So unless there's functionality that's
_only_ in modprobe-small, we should be fine.

[1]: https://git.busybox.net/busybox/tree/modutils/Config.src?h=1_34_1#n8
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 40d44690afe..b8a017adcf4 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -81,6 +81,14 @@ stdenv.mkDerivation rec {
 
     CONFIG_LFS y
 
+    # More features for modprobe.
+    ${lib.optionalString (!enableMinimal) ''
+      CONFIG_FEATURE_MODPROBE_BLACKLIST y
+      CONFIG_FEATURE_MODUTILS_ALIAS y
+      CONFIG_FEATURE_MODUTILS_SYMBOLS y
+      CONFIG_MODPROBE_SMALL n
+    ''}
+
     ${lib.optionalString enableStatic ''
       CONFIG_STATIC y
     ''}