diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
| commit | 075814c60a316cfd088c88f26f75ab21b5850b98 (patch) | |
| tree | f6e33ac693630827deb309faa5fa4931588db57d /shell/Config.src | |
| parent | 977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff) | |
| parent | f37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff) | |
| download | busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2 busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip | |
Merge branch busybox (up to "ash: comment out free(p) just before...")
Diffstat (limited to 'shell/Config.src')
| -rw-r--r-- | shell/Config.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/Config.src b/shell/Config.src index b31e62dda..e4df35973 100644 --- a/shell/Config.src +++ b/shell/Config.src | |||
| @@ -88,7 +88,7 @@ config FEATURE_SH_EXTRA_QUIET | |||
| 88 | config FEATURE_SH_STANDALONE | 88 | config FEATURE_SH_STANDALONE |
| 89 | bool "Standalone shell" | 89 | bool "Standalone shell" |
| 90 | default n | 90 | default n |
| 91 | depends on (HUSH || ASH) && FEATURE_PREFER_APPLETS | 91 | depends on (HUSH || ASH) |
| 92 | help | 92 | help |
| 93 | This option causes busybox shells to use busybox applets | 93 | This option causes busybox shells to use busybox applets |
| 94 | in preference to executables in the PATH whenever possible. For | 94 | in preference to executables in the PATH whenever possible. For |
| @@ -121,7 +121,7 @@ config FEATURE_SH_STANDALONE | |||
| 121 | config FEATURE_SH_NOFORK | 121 | config FEATURE_SH_NOFORK |
| 122 | bool "Run 'nofork' applets directly" | 122 | bool "Run 'nofork' applets directly" |
| 123 | default n | 123 | default n |
| 124 | depends on (HUSH || ASH) && FEATURE_PREFER_APPLETS | 124 | depends on (HUSH || ASH) |
| 125 | help | 125 | help |
| 126 | This option causes busybox shells to not execute typical | 126 | This option causes busybox shells to not execute typical |
| 127 | fork/exec/wait sequence, but call <applet>_main directly, | 127 | fork/exec/wait sequence, but call <applet>_main directly, |