summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2002-09-01 06:45:55 +0000
committerEric Andersen2002-09-01 06:45:55 +0000
commit2bec97c076e7183b4ce4e5de3739299bbd3a06fa (patch)
treee86eaef5a82709a64df6f0f712f325ab0be70ae0
parent1130976f8ec187551c5c485bef3a0464a72f06a1 (diff)
downloadbusybox-2bec97c076e7183b4ce4e5de3739299bbd3a06fa.zip
busybox-2bec97c076e7183b4ce4e5de3739299bbd3a06fa.tar.gz
Some CML1 grammar fixes
-Erik
-rw-r--r--modutils/config.in2
-rw-r--r--shell/config.in3
-rw-r--r--sysdeps/linux/config.in2
-rw-r--r--util-linux/config.in4
4 files changed, 7 insertions, 4 deletions
diff --git a/modutils/config.in b/modutils/config.in
index 7a1d56c..7fe7ec1 100644
--- a/modutils/config.in
+++ b/modutils/config.in
@@ -14,11 +14,11 @@ bool 'rmmod' CONFIG_RMMOD
if [ "$CONFIG_INSMOD" = "y" ]; then
comment 'Module support options'
+ bool 'Support for older (pre 2.1) Linux kernels' CONFIG_FEATURE_OLD_MODULE_INTERFACE
if [ "$CONFIG_FEATURE_OLD_MODULE_INTERFACE" = "n" ] ; then
define_bool CONFIG_FEATURE_NEW_MODULE_INTERFACE y
fi
bool 'Support for new (post 2.1) kernels' CONFIG_FEATURE_NEW_MODULE_INTERFACE
- bool 'Support for older (pre 2.1) Linux kernels' CONFIG_FEATURE_OLD_MODULE_INTERFACE
bool 'Support module version checking' CONFIG_FEATURE_INSMOD_VERSION_CHECKING
bool 'Support image in kernel memory optimization (uClinux only)' CONFIG_FEATURE_INSMOD_LOADINKMEM
fi
diff --git a/shell/config.in b/shell/config.in
index d6a7f16..b34c238 100644
--- a/shell/config.in
+++ b/shell/config.in
@@ -11,7 +11,8 @@ choice 'Choose your default shell' \
hush CONFIG_FEATURE_SH_IS_HUSH \
lash CONFIG_FEATURE_SH_IS_LASH \
msh CONFIG_FEATURE_SH_IS_MSH \
- none CONFIG_FEATURE_SH_IS_NONE"
+ none CONFIG_FEATURE_SH_IS_NONE" \
+ ash
if [ "$CONFIG_FEATURE_SH_IS_ASH" = "y" ] ; then
define_bool CONFIG_ASH y
diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index d799c94..c186055 100644
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -28,7 +28,6 @@ endmenu
source archival/config.in
source console-tools/config.in
source editors/config.in
-source fileutils/config.in
source findutils/config.in
source init/config.in
source miscutils/config.in
@@ -41,4 +40,5 @@ source shellutils/config.in
source sysklogd/config.in
source textutils/config.in
source util-linux/config.in
+source fileutils/config.in
diff --git a/util-linux/config.in b/util-linux/config.in
index bcc99bb..25d0c5a 100644
--- a/util-linux/config.in
+++ b/util-linux/config.in
@@ -43,7 +43,9 @@ bool 'swaponoff' CONFIG_SWAPONOFF
bool 'mount' CONFIG_MOUNT
if [ "$CONFIG_MOUNT" = "y" ]; then
bool ' Support mounting nfs file systems' CONFIG_NFSMOUNT
- bool ' Use devmtab instead of /proc (needs a patched kernel)' CONFIG_FEATURE_USE_DEVPS_PATCH
+ if [ "$CONFIG_FEATURE_USE_DEVPS_PATCH" = "n" ]; then
+ bool ' Use devmtab instead of /proc (needs a patched kernel)' CONFIG_FEATURE_USE_DEVPS_PATCH
+ fi
fi
bool 'umount' CONFIG_UMOUNT
if [ "$CONFIG_UMOUNT" = "y" ]; then