summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2010-02-27 23:15:22 +0100
committerDenys Vlasenko2010-02-27 23:15:22 +0100
commitf6b29a2dc9fc4e3c0cf8cd0c2ac6e674d47480ec (patch)
tree351eb822e35a362ea41bb7bbd8fccae0890a93ad
parent99069330a104e6d360635174be5f5ed054c418b8 (diff)
parent45cec1ee894e5203c298c094cd37b22c470d041d (diff)
downloadbusybox-f6b29a2dc9fc4e3c0cf8cd0c2ac6e674d47480ec.zip
busybox-f6b29a2dc9fc4e3c0cf8cd0c2ac6e674d47480ec.tar.gz
Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
-rw-r--r--coreutils/Config.in8
-rw-r--r--networking/Config.in56
2 files changed, 36 insertions, 28 deletions
diff --git a/coreutils/Config.in b/coreutils/Config.in
index fe481ff..297f465 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -183,6 +183,10 @@ config FEATURE_DF_FANCY
help
This option enables -a, -i and -B.
+ -a Show all filesystems
+ -i Inodes
+ -B <SIZE> Blocksize
+
config DIRNAME
bool "dirname"
default n
@@ -682,6 +686,10 @@ config FEATURE_FANCY_TAIL
The options (-q, -s, and -v) are provided by GNU tail, but
are not specific in the SUSv3 standard.
+ -q Never output headers giving file names
+ -s SEC Wait SEC seconds between reads with -f
+ -v Always output headers giving file names
+
config TEE
bool "tee"
default n
diff --git a/networking/Config.in b/networking/Config.in
index 788e128..90d905e 100644
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -737,6 +737,13 @@ config SLATTACH
# def_bool n
# depends on TC
+config TCPSVD
+ bool "tcpsvd"
+ default n
+ help
+ tcpsvd listens on a TCP port and runs a program for each new
+ connection.
+
config TELNET
bool "telnet"
default n
@@ -929,6 +936,20 @@ config FEATURE_TRACEROUTE_USE_ICMP
help
Add option -I to use ICMP ECHO instead of UDP datagrams.
+config TUNCTL
+ bool "tunctl"
+ default n
+ help
+ tunctl creates or deletes tun devices.
+
+config FEATURE_TUNCTL_UG
+ bool "Support owner:group assignment"
+ default n
+ depends on TUNCTL
+ help
+ Allow to specify owner and group of newly created interface.
+ 340 bytes of pure bloat. Say no here.
+
source networking/udhcp/Config.in
config IFUPDOWN_UDHCPC_CMD_OPTIONS
@@ -940,6 +961,13 @@ config IFUPDOWN_UDHCPC_CMD_OPTIONS
Intended to alter options not available in /etc/network/interfaces.
(IE: --syslog --background etc...)
+config UDPSVD
+ bool "udpsvd"
+ default n
+ help
+ udpsvd listens on an UDP port and runs a program for each new
+ connection.
+
config VCONFIG
bool "vconfig"
default n
@@ -986,32 +1014,4 @@ config ZCIP
See http://www.zeroconf.org for further details, and "zcip.script"
in the busybox examples.
-config TCPSVD
- bool "tcpsvd"
- default n
- help
- tcpsvd listens on a TCP port and runs a program for each new
- connection.
-
-config TUNCTL
- bool "tunctl"
- default n
- help
- tunctl creates or deletes tun devices.
-
-config FEATURE_TUNCTL_UG
- bool "Support owner:group assignment"
- default n
- depends on TUNCTL
- help
- Allow to specify owner and group of newly created interface.
- 340 bytes of pure bloat. Say no here.
-
-config UDPSVD
- bool "udpsvd"
- default n
- help
- udpsvd listens on an UDP port and runs a program for each new
- connection.
-
endmenu