modutils: optional modutils-small by Vladimir Dronnikov.

 15kb smaller than standard one.
libbb/recursive_action.c: commented-out code for aborting the scan.

1 files changed, 57 insertions, 4 deletions

diff --git a/modutils/Config.in b/modutils/Config.in
index 2b0bcdd..25841b8 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -5,14 +5,63 @@
 
 menu "Linux Module Utilities"
 
+config MODPROBE_SMALL
+	bool "Simplified modutils"
+	default n
+	help
+	  Simplified modutils.
+
+	  With this option modprobe does not use or require
+	  modules.dep or /etc/modules.conf files.
+	  It scans module files in /lib/modules/`uname -r` and
+	  determines dependencies and module alias names on the fly.
+	  This may make module loading slower, most notably
+	  when one needs to load module by alias (this requires
+	  scanning through module _bodies_).
+
+	  Additional module parameters can be stored in
+	  /etc/modules/$module_name files.
+
+	  Apart from modprobe, other utilities are also provided:
+	  - insmod is an alias to modprobe
+	  - rmmod is an alias to modprobe -r
+	  - depmod is provided but does nothing
+
+	  As of 2008-07, this code is experimental. It it 15kb smaller
+	  than "non-small" modutils.
+
+config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
+	bool "module options on cmdline"
+	default n
+	depends on MODPROBE_SMALL
+	help
+	  Allow insmod and modprobe take module options from command line.
+	  N.B. Very bloaty.
+
+config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+	bool "Skip loading of already loaded modules"
+	default n
+	depends on MODPROBE_SMALL
+	help
+	  Check if the module is already loaded.
+	  N.B. It's racy.
+
+config FEATURE_MODPROBE_SMALL_ZIPPED
+	bool "Handle gzipped or bzipped modules"
+	default n
+	depends on MODPROBE_SMALL
+	help
+	  Handle compressed modules. Bloaty. Sloooow.
+
 config DEPMOD
 	bool "depmod"
 	default n
+	depends on !MODPROBE_SMALL
 	help
 	  depmod generates modules.dep (FIXME: elaborate)
 
 config FEATURE_DEPMOD_PRUNE_FANCY
-	bool "fancy dependency pruning"
+	bool "Fancy dependency pruning"
 	default n
 	depends on DEPMOD
 	help
@@ -26,7 +75,7 @@ config FEATURE_DEPMOD_PRUNE_FANCY
 	  If unsure, say N.
 
 config FEATURE_DEPMOD_ALIAS
-	bool "alias support"
+	bool "Alias support"
 	default n
 	depends on DEPMOD
 	help
@@ -38,6 +87,7 @@ config FEATURE_DEPMOD_ALIAS
 config INSMOD
 	bool "insmod"
 	default n
+	depends on !MODPROBE_SMALL
 	help
 	  insmod is used to load specified modules in the running kernel.
 
@@ -93,12 +143,14 @@ config FEATURE_INSMOD_LOAD_MAP_FULL
 config RMMOD
 	bool "rmmod"
 	default n
+	depends on !MODPROBE_SMALL
 	help
 	  rmmod is used to unload specified modules from the kernel.
 
 config LSMOD
 	bool "lsmod"
 	default n
+	depends on !MODPROBE_SMALL
 	help
 	  lsmod is used to display a list of loaded modules.
 
@@ -113,6 +165,7 @@ config FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 config MODPROBE
 	bool "modprobe"
 	default n
+	depends on !MODPROBE_SMALL
 	help
 	  Handle the loading of modules, and their dependencies on a high
 	  level.
@@ -196,7 +249,7 @@ config DEFAULT_MODULES_DIR
 	# Simulate indentation
 	string "Default directory containing modules"
 	default "/lib/modules"
-	depends on INSMOD || RMMOD || MODPROBE || DEPMOD
+	depends on INSMOD || RMMOD || MODPROBE || MODPROBE_SMALL || DEPMOD
 	help
 	  Directory that contains kernel modules.
 	  Defaults to "/lib/modules"
@@ -205,7 +258,7 @@ config DEFAULT_DEPMOD_FILE
 	# Simulate indentation
 	string "Default name of modules.dep"
 	default "modules.dep"
-	depends on INSMOD || RMMOD || MODPROBE || DEPMOD
+	depends on INSMOD || RMMOD || MODPROBE || MODPROBE_SMALL || DEPMOD
 	help
 	  Filename that contains kernel modules dependencies.
 	  Defaults to "modules.dep"