diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-22 14:36:49 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-01 13:01:04 +0100 |
commit | e1065da652ca3680fdf465dd502a2bae2c2a89b9 (patch) | |
tree | 27e17189f1fd9f959f54a0a006db8d4a28f73c25 /shell | |
parent | 2169b25b152b54935fdc706dbf1032df6ae1af27 (diff) | |
download | busybox-w32-e1065da652ca3680fdf465dd502a2bae2c2a89b9.tar.gz busybox-w32-e1065da652ca3680fdf465dd502a2bae2c2a89b9.tar.bz2 busybox-w32-e1065da652ca3680fdf465dd502a2bae2c2a89b9.zip |
Tweak some config defaults; fix MODPROBE_SMALL ordering in "make config"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 802626d4e..89339182e 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -117,7 +117,7 @@ | |||
117 | //config: | 117 | //config: |
118 | //config:config ASH_INTERNAL_GLOB | 118 | //config:config ASH_INTERNAL_GLOB |
119 | //config: bool "Use internal glob() implementation" | 119 | //config: bool "Use internal glob() implementation" |
120 | //config: default n | 120 | //config: default y # Y is bigger, but because of uclibc glob() bug, let Y be default for now |
121 | //config: depends on ASH | 121 | //config: depends on ASH |
122 | //config: help | 122 | //config: help |
123 | //config: Do not use glob() function from libc, use internal implementation. | 123 | //config: Do not use glob() function from libc, use internal implementation. |
@@ -218,11 +218,10 @@ | |||
218 | //config: | 218 | //config: |
219 | //config:config ASH_MAIL | 219 | //config:config ASH_MAIL |
220 | //config: bool "Check for new mail on interactive shells" | 220 | //config: bool "Check for new mail on interactive shells" |
221 | //config: default n | 221 | //config: default y |
222 | //config: depends on ASH | 222 | //config: depends on ASH |
223 | //config: help | 223 | //config: help |
224 | //config: Enable "check for new mail" function in the ash shell. | 224 | //config: Enable "check for new mail" function in the ash shell. |
225 | //config: | ||
226 | 225 | ||
227 | //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) | 226 | //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) |
228 | //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) | 227 | //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) |