From 0c6fb98d013e4ffc664935a51adce94254d10f83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 27 Nov 2009 19:33:20 +0100 Subject: update busybox and default config --- package/busybox/config/networking/Config.in | 118 ++++++++++++++-------- package/busybox/config/networking/udhcp/Config.in | 13 ++- 2 files changed, 86 insertions(+), 45 deletions(-) (limited to 'package/busybox/config/networking') diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 6b7f1b28c..797c21aea 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -7,13 +7,24 @@ menu "Networking Utilities" config BUSYBOX_FEATURE_IPV6 bool "Enable IPv6 support" - default n + default y help Enable IPv6 support in busybox. This adds IPv6 support in the networking applets. +config BUSYBOX_FEATURE_UNIX_LOCAL + bool "Enable Unix domain socket support (usually not needed)" + default n + help + Enable Unix domain socket support in all busybox networking + applets. Address of the form local:/path/to/unix/socket + will be recognized. + + This extension is almost never used in real world usage. + You most likely want to say N. + config BUSYBOX_FEATURE_PREFER_IPV4_ADDRESS - bool "Preferentially use IPv4 addresses from DNS queries" + bool "Prefer IPv4 addresses from DNS queries" default y depends on BUSYBOX_FEATURE_IPV6 help @@ -43,12 +54,13 @@ config BUSYBOX_ARP config BUSYBOX_ARPING bool "arping" - default y + default n help Ping hosts by ARP packets. config BUSYBOX_BRCTL bool "brctl" + depends on !ADK_PACKAGE_BRCTL default n help Manage ethernet bridges. @@ -93,6 +105,19 @@ config BUSYBOX_FAKEIDENTD fakeidentd listens on the ident port and returns a predefined fake value on any query. +config BUSYBOX_FTPD + bool "ftpd" + default n + help + simple FTP daemon. You have to run it via inetd. + +config BUSYBOX_FEATURE_FTP_WRITE + bool "Enable upload commands" + default y + depends on BUSYBOX_FTPD + help + Enable all kinds of FTP upload commands (-w option) + config BUSYBOX_FTPGET bool "ftpget" default n @@ -108,7 +133,7 @@ config BUSYBOX_FTPPUT config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" default n - depends on BUSYBOX_GETOPT_LONG && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT) + depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT) help Support long options for the ftpget/ftpput applet. @@ -141,14 +166,6 @@ config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE When enabled, httpd will use the kernel sendfile() function instead of read/write loop. -config BUSYBOX_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP - bool "Support reloading of global config file on HUP signal" - default n - depends on BUSYBOX_HTTPD - help - This option enables processing of SIGHUP to reload cached - configuration settings. - config BUSYBOX_FEATURE_HTTPD_SETUID bool "Enable -u option" default n @@ -175,14 +192,6 @@ config BUSYBOX_FEATURE_HTTPD_AUTH_MD5 Enables basic per URL authentication from /etc/httpd.conf using md5 passwords. -config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES - bool "Support loading additional MIME types at run-time" - default n - depends on BUSYBOX_HTTPD - help - This option enables support for additional MIME types at - run-time to be specified in the configuration file. - config BUSYBOX_FEATURE_HTTPD_CGI bool "Support Common Gateway Interface (CGI)" default y @@ -299,6 +308,12 @@ config BUSYBOX_IFENSLAVE Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). +config BUSYBOX_IFPLUGD + bool "ifplugd" + default n + help + Network interface plug detection daemon. + config BUSYBOX_IFUPDOWN bool "ifupdown" default y @@ -338,7 +353,6 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y depends on BUSYBOX_FEATURE_IFUPDOWN_IP - depends on !ADK_PACKAGE_IP select BUSYBOX_IP select BUSYBOX_FEATURE_IP_ADDRESS select BUSYBOX_FEATURE_IP_LINK @@ -372,7 +386,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV4 config BUSYBOX_FEATURE_IFUPDOWN_IPV6 bool "Support for IPv6" - default n + default y depends on BUSYBOX_IFUPDOWN && BUSYBOX_FEATURE_IPV6 help If you need support for IPv6, turn this option on. @@ -456,8 +470,8 @@ config BUSYBOX_FEATURE_INETD_RPC config BUSYBOX_IP bool "ip" - default y depends on !ADK_PACKAGE_IP + default y help The "ip" applet is a TCP/IP interface configuration and routing utility. You generally don't need "ip" to use busybox with @@ -566,7 +580,7 @@ config BUSYBOX_FEATURE_IPCALC_FANCY config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS bool "Enable long options" default n - depends on BUSYBOX_IPCALC && BUSYBOX_GETOPT_LONG + depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS help Support long options for the ipcalc applet. @@ -637,7 +651,7 @@ config BUSYBOX_FEATURE_NETSTAT_WIDE config BUSYBOX_FEATURE_NETSTAT_PRG bool "Enable PID/Program name output" - default y + default n depends on BUSYBOX_NETSTAT help Add support for -p flag to print out PID and program name. @@ -645,7 +659,7 @@ config BUSYBOX_FEATURE_NETSTAT_PRG config BUSYBOX_NSLOOKUP bool "nslookup" - default y + default n help nslookup is a tool to query Internet name servers. @@ -658,7 +672,7 @@ config BUSYBOX_PING config BUSYBOX_PING6 bool "ping6" - default n + default y depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING help This will give you a ping that can talk IPv6. @@ -702,7 +716,7 @@ config BUSYBOX_SLATTACH config BUSYBOX_TELNET bool "telnet" - default y + default n help Telnet is an interface to the TELNET protocol, but is also commonly used to test other simple protocols. @@ -823,24 +837,23 @@ config BUSYBOX_FEATURE_TFTP_BLOCKSIZE config BUSYBOX_TFTP_DEBUG bool "Enable debug" default n - depends on BUSYBOX_TFTP + depends on BUSYBOX_TFTP || BUSYBOX_TFTPD help - Enable debug settings for tftp. This is useful if you're running - into problems with tftp as the protocol doesn't help you much when - you run into problems. + Make tftp[d] print debugging messages on stderr. + This is useful if you are diagnosing a bug in tftp[d]. config BUSYBOX_TRACEROUTE bool "traceroute" - default y + default n help - Utility to trace the route of IP packets + Utility to trace the route of IP packets. config BUSYBOX_FEATURE_TRACEROUTE_VERBOSE bool "Enable verbose output" - default y + default n depends on BUSYBOX_TRACEROUTE help - Add some verbosity to traceroute. This includes amongst other things + Add some verbosity to traceroute. This includes among other things hostnames and ICMP response types. config BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE @@ -853,13 +866,22 @@ config BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP bool "Use ICMP instead of UDP" - default y + default n depends on BUSYBOX_TRACEROUTE help - Add feature to allow for ICMP ECHO instead of UDP datagrams. + Add option -I to use ICMP ECHO instead of UDP datagrams. source package/busybox/config/networking/udhcp/Config.in +config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS + string "ifup udhcpc command line options" + default "-b -R" + depends on BUSYBOX_IFUPDOWN && BUSYBOX_APP_UDHCPC + help + Command line options to pass to udhcpc from ifup. + Intended to alter options not available in /etc/network/interfaces. + (IE: --syslog --background etc...) + config BUSYBOX_VCONFIG bool "vconfig" default n @@ -868,7 +890,7 @@ config BUSYBOX_VCONFIG config BUSYBOX_WGET bool "wget" - default y if !ADK_PACKAGE_WGET + default y depends on !ADK_PACKAGE_WGET help wget is a utility for non-interactive download of files from HTTP, @@ -876,7 +898,7 @@ config BUSYBOX_WGET config BUSYBOX_FEATURE_WGET_STATUSBAR bool "Enable a nifty process meter (+2k)" - default n + default y depends on BUSYBOX_WGET help Enable the transfer progress bar for wget transfers. @@ -891,7 +913,7 @@ config BUSYBOX_FEATURE_WGET_AUTHENTICATION config BUSYBOX_FEATURE_WGET_LONG_OPTIONS bool "Enable long options" default n - depends on BUSYBOX_WGET && BUSYBOX_GETOPT_LONG + depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS help Support long options for the wget applet. @@ -914,6 +936,20 @@ config BUSYBOX_TCPSVD tcpsvd listens on a TCP port and runs a program for each new connection. +config BUSYBOX_TUNCTL + bool "tunctl" + default n + help + tunctl creates or deletes tun devices. + +config BUSYBOX_FEATURE_TUNCTL_UG + bool "Support owner:group assignment" + default n + depends on BUSYBOX_TUNCTL + help + Allow to specify owner and group of newly created interface. + 340 bytes of pure bloat. Say no here. + config BUSYBOX_UDPSVD bool "udpsvd" default n diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 0e507ce75..05b9ffb67 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -75,11 +75,16 @@ config BUSYBOX_FEATURE_UDHCP_PORT This feature is typically not needed. config BUSYBOX_UDHCP_DEBUG - bool "Compile udhcp with noisy debugging messages" - default n - depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC + int "Maximum verbosity level for udhcp applets (0..9)" + default 0 + range 0 9 + depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC || BUSYBOX_APP_DHCPRELAY help - If selected, udhcpd will output extra debugging output. + Verbosity can be increased with multiple -v options. + This options controls how high it can be cranked up. + + Bigger values result in bigger code. Levels above 1 + are very verbose and useful for debugging only. config BUSYBOX_FEATURE_UDHCP_RFC3397 bool "Support for RFC3397 domain search (experimental)" -- cgit v1.2.3