summaryrefslogtreecommitdiff
path: root/package/busybox/config
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-25 19:08:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-25 19:08:01 +0000
commit1233a57f74605e17e501d2195cdf0d33c27bca40 (patch)
tree369d061264387fbc399220e6d53bc6856335047b /package/busybox/config
parente2c94324e7175e4dd970e0e7d8aaa5090b52e158 (diff)
downloadmtk-20170518-1233a57f74605e17e501d2195cdf0d33c27bca40.zip
mtk-20170518-1233a57f74605e17e501d2195cdf0d33c27bca40.tar.gz
mtk-20170518-1233a57f74605e17e501d2195cdf0d33c27bca40.tar.bz2
upgrade busybox to 1.4.0
SVN-Revision: 6204
Diffstat (limited to 'package/busybox/config')
-rw-r--r--package/busybox/config/Config.in12
-rw-r--r--package/busybox/config/archival/Config.in2
-rw-r--r--package/busybox/config/e2fsprogs/Config.in68
-rw-r--r--package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in67
-rw-r--r--package/busybox/config/editors/Config.in9
-rw-r--r--package/busybox/config/loginutils/Config.in18
-rw-r--r--package/busybox/config/miscutils/Config.in5
-rw-r--r--package/busybox/config/networking/Config.in12
-rw-r--r--package/busybox/config/procps/Config.in2
9 files changed, 145 insertions, 50 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 6d2f5b2..d288bfb 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -396,14 +396,14 @@ config BUSYBOX_CONFIG_EFENCE
endchoice
-config BUSYBOX_CONFIG_DEBUG_YANK_SUSv2
- bool "Disable obsolete features removed before SUSv3?"
+config BUSYBOX_CONFIG_INCLUDE_SUSv2
+ bool "Enable obsolete features removed before SUSv3?"
default y
help
- This option will disable backwards compatibility with SuSv2,
+ This option will enable backwards compatibility with SuSv2,
specifically, old-style numeric options ('command -1 <file>')
- will not be supported in head, tail, and fold. (Note: should
- yank from renice too.)
+ will be supported in head, tail, and fold. (Note: should
+ affect renice too.)
endmenu
@@ -440,7 +440,7 @@ config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
prompt "not installed"
depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL
help
- Do not install applets links. Usefull when using the -install feature
+ Do not install applet links. Useful when using the -install feature
or a standalone shell for rescue pruposes.
endchoice
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index d92d660..ed5b0c5 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -139,7 +139,7 @@ config BUSYBOX_CONFIG_RPM
bool "rpm"
default n
help
- Mini RPM applet - queries and extracts
+ Mini RPM applet - queries and extracts RPM packages.
config BUSYBOX_CONFIG_TAR
bool "tar"
diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in
index e9ef3dc..1b83665 100644
--- a/package/busybox/config/e2fsprogs/Config.in
+++ b/package/busybox/config/e2fsprogs/Config.in
@@ -11,14 +11,14 @@ config BUSYBOX_CONFIG_CHATTR
help
chattr changes the file attributes on a second extended file system.
-config BUSYBOX_CONFIG_E2FSCK
- bool "e2fsck"
- default n
- help
- e2fsck is used to check Linux second extended file systems (ext2fs).
- e2fsck also supports ext2 filesystems countaining a journal (ext3).
- The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
- provided.
+### config E2FSCK
+### bool "e2fsck"
+### default n
+### help
+### e2fsck is used to check Linux second extended file systems (ext2fs).
+### e2fsck also supports ext2 filesystems countaining a journal (ext3).
+### The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+### provided.
config BUSYBOX_CONFIG_FSCK
bool "fsck"
@@ -34,34 +34,34 @@ config BUSYBOX_CONFIG_LSATTR
help
lsattr lists the file attributes on a second extended file system.
-config BUSYBOX_CONFIG_MKE2FS
- bool "mke2fs"
- default n
- help
- mke2fs is used to create an ext2/ext3 filesystem. The normal compat
- symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+### config MKE2FS
+### bool "mke2fs"
+### default n
+### help
+### mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
-config BUSYBOX_CONFIG_TUNE2FS
- bool "tune2fs"
- default n
- help
- tune2fs allows the system administrator to adjust various tunable
- filesystem parameters on Linux ext2/ext3 filesystems.
+### config TUNE2FS
+### bool "tune2fs"
+### default n
+### help
+### tune2fs allows the system administrator to adjust various tunable
+### filesystem parameters on Linux ext2/ext3 filesystems.
-config BUSYBOX_CONFIG_E2LABEL
- bool "e2label"
- default n
- depends on BUSYBOX_CONFIG_TUNE2FS
- help
- e2label will display or change the filesystem label on the ext2
- filesystem located on device.
+### config E2LABEL
+### bool "e2label"
+### default n
+### depends on TUNE2FS
+### help
+### e2label will display or change the filesystem label on the ext2
+### filesystem located on device.
-config BUSYBOX_CONFIG_FINDFS
- bool "findfs"
- default n
- depends on BUSYBOX_CONFIG_TUNE2FS
- help
- findfs will search the disks in the system looking for a filesystem
- which has a label matching label or a UUID equal to uuid.
+### config FINDFS
+### bool "findfs"
+### default n
+### depends on TUNE2FS
+### help
+### findfs will search the disks in the system looking for a filesystem
+### which has a label matching label or a UUID equal to uuid.
endmenu
diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
new file mode 100644
index 0000000..e9ef3dc
--- /dev/null
+++ b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
@@ -0,0 +1,67 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Ext2 FS Progs"
+
+config BUSYBOX_CONFIG_CHATTR
+ bool "chattr"
+ default n
+ help
+ chattr changes the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_E2FSCK
+ bool "e2fsck"
+ default n
+ help
+ e2fsck is used to check Linux second extended file systems (ext2fs).
+ e2fsck also supports ext2 filesystems countaining a journal (ext3).
+ The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+ provided.
+
+config BUSYBOX_CONFIG_FSCK
+ bool "fsck"
+ default n
+ help
+ fsck is used to check and optionally repair one or more filesystems.
+ In actuality, fsck is simply a front-end for the various file system
+ checkers (fsck.fstype) available under Linux.
+
+config BUSYBOX_CONFIG_LSATTR
+ bool "lsattr"
+ default n
+ help
+ lsattr lists the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_MKE2FS
+ bool "mke2fs"
+ default n
+ help
+ mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+ symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+
+config BUSYBOX_CONFIG_TUNE2FS
+ bool "tune2fs"
+ default n
+ help
+ tune2fs allows the system administrator to adjust various tunable
+ filesystem parameters on Linux ext2/ext3 filesystems.
+
+config BUSYBOX_CONFIG_E2LABEL
+ bool "e2label"
+ default n
+ depends on BUSYBOX_CONFIG_TUNE2FS
+ help
+ e2label will display or change the filesystem label on the ext2
+ filesystem located on device.
+
+config BUSYBOX_CONFIG_FINDFS
+ bool "findfs"
+ default n
+ depends on BUSYBOX_CONFIG_TUNE2FS
+ help
+ findfs will search the disks in the system looking for a filesystem
+ which has a label matching label or a UUID equal to uuid.
+
+endmenu
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 3c1a320..6844049 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -127,5 +127,12 @@ config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
This will make the cursor movement faster, but requires more memory
and it makes the applet a tiny bit larger.
-endmenu
+config BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC
+ bool "Allow vi and awk to execute shell commands"
+ default y
+ depends on BUSYBOX_CONFIG_VI || BUSYBOX_CONFIG_AWK
+ help
+ Enables vi and awk features which allows user to execute
+ shell commands (using system() C call).
+endmenu
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 268c8b6..6171d02 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -142,6 +142,13 @@ config BUSYBOX_CONFIG_PASSWD
Note that Busybox binary must be setuid root for this applet to
work properly.
+config BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK
+ bool "Check new passwords for weakness"
+ default y
+ depends on BUSYBOX_CONFIG_PASSWD
+ help
+ With this option passwd will refuse new passwords which are "weak".
+
config BUSYBOX_CONFIG_SU
bool "su"
default n
@@ -154,12 +161,15 @@ config BUSYBOX_CONFIG_SU
Note that Busybox binary must be setuid root for this applet to
work properly.
-config BUSYBOX_CONFIG_SU_SYSLOG
- bool "Support for syslog in su"
+config BUSYBOX_CONFIG_FEATURE_SU_SYSLOG
+ bool "Enable su to write to syslog"
default n
depends on BUSYBOX_CONFIG_SU
- help
- Enables support for syslog in su.
+
+config BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS
+ bool "Enable su to check user's shell to be listed in /etc/shells"
+ depends on BUSYBOX_CONFIG_SU
+ default n
config BUSYBOX_CONFIG_SULOGIN
bool "sulogin"
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 4d5a9a1..41a42c9 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -133,6 +133,11 @@ config BUSYBOX_CONFIG_LESS
'less' is a pager, meaning that it displays text files. It possesses
a wide array of features, and is an improvement over 'more'.
+config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES
+ int "Max number of input lines less will try to eat"
+ default 9999999
+ depends on BUSYBOX_CONFIG_LESS
+
config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
bool "Enable bracket searching"
default n
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index da28e30..8df502e 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -12,6 +12,12 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
Enable IPv6 support in busybox.
This adds IPv6 support in the networking applets.
+config BUSYBOX_CONFIG_ARP
+ bool "arp"
+ default n
+ help
+ Manipulate the system ARP cache
+
config BUSYBOX_CONFIG_ARPING
bool "arping"
default y
@@ -72,15 +78,15 @@ config BUSYBOX_CONFIG_HTTPD
config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
bool "Support reloading the global config file using hup signal"
default n
- depends on BUSYBOX_CONFIG_HTTPD && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
+ depends on BUSYBOX_CONFIG_HTTPD
help
This option enables processing of SIGHUP to reload cached
configuration settings.
config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
- bool "Enable support -u <user> option"
+ bool "Enable -u <user> option"
default n
- depends on BUSYBOX_CONFIG_HTTPD && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
+ depends on BUSYBOX_CONFIG_HTTPD
help
This option allows the server to run as a specific user
rather than defaulting to the user that starts the server.
diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index 34d1ace..7c9ea61 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -42,7 +42,7 @@ config BUSYBOX_CONFIG_KILLALL5
bool "killall5"
default y
depends on BUSYBOX_CONFIG_KILL
-
+
config BUSYBOX_CONFIG_PIDOF
bool "pidof"
default y