aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2016-12-22 14:36:49 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2016-12-22 14:36:49 +0100
commit326edc3e375d6d5be205d4b1592211bf15e33bcd (patch)
tree09de5f15a633a45709298979f0d216afe553b81c
parent2166952ec393b9a8f890a12951c812c47fdfd457 (diff)
downloadbusybox-326edc3e375d6d5be205d4b1592211bf15e33bcd.tar.gz
busybox-326edc3e375d6d5be205d4b1592211bf15e33bcd.tar.bz2
Tweak some config defaults; fix MODPROBE_SMALL ordering in "make config"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xinclude/applets.h.sh8
-rw-r--r--init/init.c2
-rw-r--r--modutils/Config.src31
-rw-r--r--modutils/modprobe-small.c34
-rw-r--r--shell/ash.c5
5 files changed, 41 insertions, 39 deletions
diff --git a/include/applets.h.sh b/include/applets.h.sh
index bab4e0d72..be8b92404 100755
--- a/include/applets.h.sh
+++ b/include/applets.h.sh
@@ -6,9 +6,6 @@
# CONFIG_applet names
grep ^IF_ applets.h | grep -v IF_FEATURE_ | sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \
| grep -v MODPROBE_SMALL \
-| sed 's/BB_SYSCTL/SYSCTL/' \
-| sed 's/TEST1/[/' \
-| sed 's/TEST2/[[/' \
| sort | uniq \
>applets_APP1
@@ -17,8 +14,11 @@ grep ^IF_ applets.h | sed -e's/ //g' -e's/.*(\([a-z[][^,]*\),.*/\1/' \
| grep -v '^bash$' \
| grep -v '^sh$' \
| tr a-z A-Z \
+| sed 's/^SYSCTL$/BB_SYSCTL/' \
+| sed 's/^\[\[$/TEST1/' \
+| sed 's/^\[$/TEST2/' \
| sort | uniq \
>applets_APP2
diff -u applets_APP1 applets_APP2 >applets_APP.diff
-rm applets_APP1 applets_APP2
+#rm applets_APP1 applets_APP2
diff --git a/init/init.c b/init/init.c
index 0813d1b5f..08cfa2f8c 100644
--- a/init/init.c
+++ b/init/init.c
@@ -83,7 +83,7 @@
//config:
//config:config FEATURE_INIT_COREDUMPS
//config: bool "Support dumping core for child processes (debugging only)"
-//config: default y
+//config: default n # not Y because this is a debug option
//config: depends on INIT || LINUXRC
//config: help
//config: If this option is enabled and the file /.init_enable_core
diff --git a/modutils/Config.src b/modutils/Config.src
index 4227f356a..84ff34a08 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -5,6 +5,37 @@
menu "Linux Module Utilities"
+config MODPROBE_SMALL
+ bool "Simplified modutils"
+ default y
+ select PLATFORM_LINUX
+ help
+ Simplified modutils.
+
+ With this option modprobe does not require modules.dep file
+ and does not use /etc/modules.conf file.
+ It scans module files in /lib/modules/`uname -r` and
+ determines dependencies and module alias names on the fly.
+ This may make module loading slower, most notably
+ when one needs to load module by alias (this requires
+ scanning through module _bodies_).
+
+ At the first attempt to load a module by alias modprobe
+ will try to generate modules.dep.bb file in order to speed up
+ future loads by alias. Failure to do so (read-only /lib/modules,
+ etc) is not reported, and future modprobes will be slow too.
+
+ NB: modules.dep.bb file format is not compatible
+ with modules.dep file as created/used by standard module tools.
+
+ Additional module parameters can be stored in
+ /etc/modules/$module_name files.
+
+ Apart from modprobe, other utilities are also provided:
+ - insmod is an alias to modprobe
+ - rmmod is an alias to modprobe -r
+ - depmod generates modules.dep.bb
+
INSERT
comment "Options common to multiple modutils"
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 51ba42f7a..e3a349b4e 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -7,37 +7,9 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-//config:config MODPROBE_SMALL
-//config: bool "Simplified modutils"
-//config: default y
-//config: select PLATFORM_LINUX
-//config: help
-//config: Simplified modutils.
-//config:
-//config: With this option modprobe does not require modules.dep file
-//config: and does not use /etc/modules.conf file.
-//config: It scans module files in /lib/modules/`uname -r` and
-//config: determines dependencies and module alias names on the fly.
-//config: This may make module loading slower, most notably
-//config: when one needs to load module by alias (this requires
-//config: scanning through module _bodies_).
-//config:
-//config: At the first attempt to load a module by alias modprobe
-//config: will try to generate modules.dep.bb file in order to speed up
-//config: future loads by alias. Failure to do so (read-only /lib/modules,
-//config: etc) is not reported, and future modprobes will be slow too.
-//config:
-//config: NB: modules.dep.bb file format is not compatible
-//config: with modules.dep file as created/used by standard module tools.
-//config:
-//config: Additional module parameters can be stored in
-//config: /etc/modules/$module_name files.
-//config:
-//config: Apart from modprobe, other utilities are also provided:
-//config: - insmod is an alias to modprobe
-//config: - rmmod is an alias to modprobe -r
-//config: - depmod generates modules.dep.bb
-//config:
+
+/* config MODPROBE_SMALL is defined in Config.src to ensure better "make config" order */
+
//config:config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
//config: bool "Accept module options on modprobe command line"
//config: default y
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 @@
//config:
//config:config ASH_INTERNAL_GLOB
//config: bool "Use internal glob() implementation"
-//config: default n
+//config: default y # Y is bigger, but because of uclibc glob() bug, let Y be default for now
//config: depends on ASH
//config: help
//config: Do not use glob() function from libc, use internal implementation.
@@ -218,11 +218,10 @@
//config:
//config:config ASH_MAIL
//config: bool "Check for new mail on interactive shells"
-//config: default n
+//config: default y
//config: depends on ASH
//config: help
//config: Enable "check for new mail" function in the ash shell.
-//config:
//applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
//applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))