Merge branch 'origin/master' (early part)

1 files changed, 0 insertions, 59 deletions

diff --git a/shell/Config.src b/shell/Config.src
index 6389d943a..c9c2439e7 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -62,29 +62,6 @@ config FEATURE_BASH_IS_NONE
 endchoice
 
 
-config LASH
-        bool "lash (deprecated: aliased to hush)"
-        default n
-        select HUSH
-        help
-          lash is deprecated and will be removed, please migrate to hush.
-
-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.
-
-#         The minix shell (adds just 30k) is quite complete and handles things
-#         like for/do/done, case/esac and all the things you expect a Bourne
-#         shell to do. It is not always pedantically correct about Bourne
-#         shell grammar (try running the shell testscript "tests/sh.testcases"
-#         on it and compare vs bash) but for most things it works quite well.
-#         It uses only vfork, so it can be used on uClinux systems.
-
-
 config SH_MATH_SUPPORT
         bool "POSIX math support"
         default y
@@ -158,40 +135,4 @@ config FEATURE_SH_NOFORK
 
           This feature is relatively new. Use with care.
 
-config CTTYHACK
-        bool "cttyhack"
-        default y
-        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.
-          This device is special - it cannot be a controlling tty.
-
-          Proper solution is to use correct device instead of /dev/console.
-
-          cttyhack provides "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
-          that device a controlling tty. This may require cttyhack
-          to be a session leader.
-
-          Example for /etc/inittab (for busybox init):
-
-          ::respawn:/bin/cttyhack /bin/sh
-
-          Starting an interactive shell from boot shell script:
-
-          setsid cttyhack sh
-
-          Giving controlling tty to shell running with PID 1:
-
-          # exec cttyhack sh
-
-          Without cttyhack, you need to know exact tty name,
-          and do something like this:
-
-          # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
-
 endmenu