kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / busybox / config / shell / Config.in

diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 57f490e..a271a38 100644 (file)
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
@@ -23,6 +24,13 @@ config BUSYBOX_CONFIG_ASH_BASH_COMPAT
        help
          Enable bash-compatible extensions.
 
+config BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT
+       bool "Idle timeout variable"
+       default n
+       depends on BUSYBOX_CONFIG_ASH
+       help
+         Enables bash-like auto-logout after $TMOUT seconds of idle time.
+
 config BUSYBOX_CONFIG_ASH_JOB_CONTROL
        bool "Job control"
        default y
@@ -31,7 +39,7 @@ config BUSYBOX_CONFIG_ASH_JOB_CONTROL
          Enable job control in the ash shell.
 
 config BUSYBOX_CONFIG_ASH_ALIAS
-       bool "alias support"
+       bool "Alias support"
        default y
        depends on BUSYBOX_CONFIG_ASH
        help
@@ -42,28 +50,28 @@ config BUSYBOX_CONFIG_ASH_GETOPTS
        default y
        depends on BUSYBOX_CONFIG_ASH
        help
-         Enable getopts builtin in the ash shell.
+         Enable support for getopts builtin in ash.
 
 config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
        bool "Builtin version of 'echo'"
        default y
        depends on BUSYBOX_CONFIG_ASH
        help
-         Enable support for echo, builtin to ash.
+         Enable support for echo builtin in ash.
 
 config BUSYBOX_CONFIG_ASH_BUILTIN_PRINTF
        bool "Builtin version of 'printf'"
        default y
        depends on BUSYBOX_CONFIG_ASH
        help
-         Enable support for printf, builtin to ash.
+         Enable support for printf builtin in ash.
 
 config BUSYBOX_CONFIG_ASH_BUILTIN_TEST
        bool "Builtin version of 'test'"
        default y
        depends on BUSYBOX_CONFIG_ASH
        help
-         Enable support for test, builtin to ash.
+         Enable support for test builtin in ash.
 
 config BUSYBOX_CONFIG_ASH_CMDCMD
        bool "'command' command to override shell builtins"
@@ -79,7 +87,7 @@ config BUSYBOX_CONFIG_ASH_MAIL
        default n
        depends on BUSYBOX_CONFIG_ASH
        help
-         Enable "check for new mail" in the ash shell.
+         Enable "check for new mail" function in the ash shell.
 
 config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE
        bool "Optimize for size instead of speed"
@@ -112,18 +120,22 @@ config BUSYBOX_CONFIG_CTTYHACK
        bool "cttyhack"
        default n
        help
-         One common problem reported on the mailing list is "can't access tty;
-         job control turned off" error message which typically appears when
-         one tries to use shell with stdin/stdout opened to /dev/console.
+         One common problem reported on the mailing list is the "can't
+         access tty; job control turned off" error message, which typically
+         appears when one tries to use a shell with stdin/stdout on
+         /dev/console.
          This device is special - it cannot be a controlling tty.
 
-         Proper solution is to use correct device instead of /dev/console.
+         The proper solution is to use the correct device instead of
+         /dev/console.
 
-         cttyhack provides "quick and dirty" solution to this problem.
+         cttyhack provides a "quick and dirty" solution to this problem.
          It analyzes stdin with various ioctls, trying to determine whether
          it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-         If it detects one, it closes stdin/out/err and reopens that device.
-         Then it executes given program. Opening the device will make
+         On Linux it also checks sysfs for a pointer to the active console.
+         If cttyhack is able to find the real console device, it closes
+         stdin/out/err and reopens that device.
+         Then it executes the given program. Opening the device will make
          that device a controlling tty. This may require cttyhack
          to be a session leader.
 
@@ -395,9 +407,9 @@ config BUSYBOX_CONFIG_FEATURE_SH_NOFORK
        default n
        depends on (BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH) && BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
        help
-         This option causes busybox shells [currently only ash]
-         to not execute typical fork/exec/wait sequence, but call <applet>_main
-         directly, if possible. (Sometimes it is not possible: for example,
+         This option causes busybox shells to not execute typical
+         fork/exec/wait sequence, but call <applet>_main directly,
+         if possible. (Sometimes it is not possible: for example,
          this is not possible in pipes).
 
          This will be done only for some applets (those which are marked
@@ -405,6 +417,17 @@ config BUSYBOX_CONFIG_FEATURE_SH_NOFORK
 
          This may significantly speed up some shell scripts.
 
-         This feature is relatively new. Use with care.
+         This feature is relatively new. Use with care. Report bugs
+         to project mailing list.
+
+config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE
+       bool "Use $HISTFILESIZE"
+       default n
+       depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
+       help
+         This option makes busybox shells to use $HISTFILESIZE variable
+         to set shell history size. Note that its max value is capped
+         by "History size" setting in library tuning section.
+
 
 endmenu