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

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

diff --git a/shell/Config.in b/shell/Config.in
index ee56d89f3ce49177028e8424c8624ba414d8a37c..998672cfc507c72a3c6387bf08313001c9629278 100644 (file)
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -24,9 +24,9 @@ config FEATURE_SH_IS_HUSH
 ####   select LASH
 ####   bool "lash"
 
-config FEATURE_SH_IS_MSH
-       select MSH
-       bool "msh"
+####config FEATURE_SH_IS_MSH
+####   select MSH
+####   bool "msh"
 
 config FEATURE_SH_IS_NONE
        bool "none"
@@ -43,9 +43,6 @@ config ASH
          shell (by Herbert Xu), which was created by porting the 'ash' shell
          (written by Kenneth Almquist) from NetBSD.
 
-comment "Ash Shell Options"
-       depends on ASH
-
 config ASH_BASH_COMPAT
        bool "bash-compatible extensions"
        default y
@@ -169,6 +166,13 @@ config HUSH
          It does not handle select, aliases, brace expansion,
          tilde expansion, &>file and >&file redirection of stdout+stderr.
 
+config HUSH_BASH_COMPAT
+       bool "bash-compatible extensions"
+       default y
+       depends on HUSH
+       help
+         Enable bash-compatible extensions.
+
 config HUSH_HELP
        bool "help builtin"
        default n
@@ -183,7 +187,7 @@ config HUSH_INTERACTIVE
        help
          Enable interactive mode (prompt and command editing).
          Without this, hush simply reads and executes commands
-         from stdin just like a shell script from the file.
+         from stdin just like a shell script from a file.
          No prompt, no PS1/PS2 magic shell variables.
 
 config HUSH_JOB
@@ -246,6 +250,14 @@ config HUSH_EXPORT_N
        help
          Enable support for export '-n' option in hush. It is a bash extension.
 
+config HUSH_RANDOM_SUPPORT
+       bool "Pseudorandom generator and $RANDOM variable"
+       default n
+       depends on HUSH
+       help
+         Enable pseudorandom generator and dynamic variable "$RANDOM".
+         Each read of "$RANDOM" will generate a new pseudorandom value.
+
 config LASH
        bool "lash (deprecated: aliased to hush)"
        default n
@@ -256,6 +268,7 @@ config LASH
 config MSH
        bool "msh (deprecated: please use hush)"
        default n
+       select HUSH
        help
          msh is deprecated and will be removed, please migrate to hush.
          If there is a feature msh has but hush does not, please let us know.
@@ -268,9 +281,6 @@ config MSH
 #        It uses only vfork, so it can be used on uClinux systems.
 
 
-comment "Bourne Shell Options"
-       depends on MSH || LASH || HUSH || ASH
-
 config SH_MATH_SUPPORT
        bool "POSIX math support"
        default y