traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / modutils / Config.in

diff --git a/modutils/Config.in b/modutils/Config.in
index e7b839db9f27278aa5ca02a029bc31ca07c314a4..83c12b67ff4138ea3f623f35dd2f36408bfeba20 100644 (file)
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -5,20 +5,6 @@
 
 menu "Linux Module Utilities"
 
-config DEFAULT_MODULES_DIR
-       string "Default directory containing modules"
-       default "/lib/modules"
-       help
-         Directory that contains kernel modules.
-         Defaults to "/lib/modules"
-
-config DEFAULT_DEPMOD_FILE
-       string "Default name of modules.dep"
-       default "modules.dep"
-       help
-         Filename that contains kernel modules dependencies.
-         Defaults to "modules.dep"
-
 config MODPROBE_SMALL
        bool "Simplified modutils"
        default n
@@ -58,7 +44,6 @@ config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
        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"
@@ -66,7 +51,6 @@ config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
        depends on MODPROBE_SMALL
        help
          Check if the module is already loaded.
-         N.B. It's racy.
 
 config INSMOD
        bool "insmod"
@@ -106,12 +90,8 @@ config MODPROBE
          Handle the loading of modules, and their dependencies on a high
          level.
 
-         Note that in the state, modprobe does not understand multiple
-         module options from the configuration file. See option below.
-
 config FEATURE_MODPROBE_BLACKLIST
-       bool
-       prompt "Blacklist support"
+       bool "Blacklist support"
        default n
        depends on MODPROBE
        help
@@ -141,6 +121,22 @@ config FEATURE_2_4_MODULES
          This increases size considerably. Say N unless you plan
          to run ancient kernels.
 
+config FEATURE_INSMOD_TRY_MMAP
+       bool "Try to load module from a mmap'ed area"
+       default n
+       depends on INSMOD || MODPROBE_SMALL
+       help
+         This option causes module loading code to try to mmap
+         module first. If it does not work (for example,
+         it does not work for compressed modules), module will be read
+         (and unpacked if needed) into a memory block allocated by malloc.
+
+         The only case when mmap works but malloc does not is when
+         you are trying to load a big module on a very memory-constrained
+         machine. Malloc will momentarily need 2x as much memory as mmap.
+
+         Choosing N saves about 250 bytes of code (on 32-bit x86).
+
 config FEATURE_INSMOD_VERSION_CHECKING
        bool "Enable module version checking"
        default n
@@ -157,7 +153,7 @@ config FEATURE_INSMOD_KSYMOOPS_SYMBOLS
          By adding module symbols to the kernel symbol table, Oops messages
          occuring within kernel modules can be properly debugged. By enabling
          this feature, module symbols will always be added to the kernel symbol
-         table for properly debugging support. If you are not interested in
+         table for proper debugging support. If you are not interested in
          Oops messages from kernel modules, say N.
 
 config FEATURE_INSMOD_LOADINKMEM
@@ -193,7 +189,7 @@ config FEATURE_INSMOD_LOAD_MAP_FULL
 config FEATURE_CHECK_TAINTED_MODULE
        bool "Support tainted module checking with new kernels"
        default y
-       depends on !MODPROBE_SMALL
+       depends on (LSMOD || FEATURE_2_4_MODULES) && !MODPROBE_SMALL
        help
          Support checking for tainted modules. These are usually binary
          only modules that will make the linux-kernel list ignore your
@@ -227,4 +223,20 @@ config FEATURE_MODUTILS_SYMBOLS
 
          Say Y if unsure.
 
+config DEFAULT_MODULES_DIR
+       string "Default directory containing modules"
+       default "/lib/modules"
+       depends on DEPMOD || MODPROBE || MODPROBE_SMALL
+       help
+         Directory that contains kernel modules.
+         Defaults to "/lib/modules"
+
+config DEFAULT_DEPMOD_FILE
+       string "Default name of modules.dep"
+       default "modules.dep"
+       depends on DEPMOD || MODPROBE || MODPROBE_SMALL
+       help
+         Filename that contains kernel modules dependencies.
+         Defaults to "modules.dep"
+
 endmenu